X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=util.c;h=2414b394fc7a2fe81b5b3043ea1c937be7cb9e2d;hp=99842e9c2032b16a095f34ca92fd06ebf02affe3;hb=b43989207a949cbc17182b451aa527afe542c98f;hpb=39677ec76616fe4165ef92afb14db2bef2488e30

diff --git a/util.c b/util.c
index 99842e9..2414b39 100644
--- a/util.c
+++ b/util.c
@@ -2,45 +2,42 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
-
+#include "dwm.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <sys/wait.h>
+#include <unistd.h>
 
-void
-error(char *errstr, ...) {
-	va_list ap;
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
-	va_end(ap);
-	exit(1);
-}
+/* static */
 
 static void
 bad_malloc(unsigned int size)
 {
-	fprintf(stderr, "fatal: could not malloc() %d bytes\n",
-			(int) size);
-	exit(1);
+	eprint("fatal: could not malloc() %u bytes\n", size);
 }
 
+/* extern */
+
 void *
 emallocz(unsigned int size)
 {
 	void *res = calloc(1, size);
+
 	if(!res)
 		bad_malloc(size);
 	return res;
 }
 
-void *
-emalloc(unsigned int size)
+void
+eprint(const char *errstr, ...)
 {
-	void *res = malloc(size);
-	if(!res)
-		bad_malloc(size);
-	return res;
+	va_list ap;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
 }
 
 void *
@@ -52,26 +49,26 @@ erealloc(void *ptr, unsigned int size)
 	return res;
 }
 
-char *
-estrdup(const char *str)
-{
-	void *res = strdup(str);
-	if(!res)
-		bad_malloc(strlen(str));
-	return res;
-}
-
 void
-failed_assert(char *a, char *file, int line)
+spawn(Arg *arg)
 {
-	fprintf(stderr, "Assertion \"%s\" failed at %s:%d\n", a, file, line);
-	abort();
-}
+	static char *shell = NULL;
 
-void
-swap(void **p1, void **p2)
-{
-	void *tmp = *p1;
-	*p1 = *p2;
-	*p2 = tmp;
+	if(!shell && !(shell = getenv("SHELL")))
+		shell = "/bin/sh";
+
+	if(!arg->cmd)
+		return;
+	if(fork() == 0) {
+		if(fork() == 0) {
+			if(dpy)
+				close(ConnectionNumber(dpy));
+			setsid();
+			execl(shell, shell, "-c", arg->cmd, NULL);
+			fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd);
+			perror(" failed");
+		}
+		exit(0);
+	}
+	wait(0);
 }