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

diff --git a/util.c b/util.c
index 99842e9..3e5fd1e 100644
--- a/util.c
+++ b/util.c
@@ -2,20 +2,15 @@
  * (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)
@@ -25,6 +20,8 @@ bad_malloc(unsigned int size)
 	exit(1);
 }
 
+/* extern */
+
 void *
 emallocz(unsigned int size)
 {
@@ -34,44 +31,31 @@ emallocz(unsigned int size)
 	return res;
 }
 
-void *
-emalloc(unsigned int size)
-{
-	void *res = malloc(size);
-	if(!res)
-		bad_malloc(size);
-	return res;
-}
-
-void *
-erealloc(void *ptr, unsigned int size)
-{
-	void *res = realloc(ptr, size);
-	if(!res)
-		bad_malloc(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)
-{
-	fprintf(stderr, "Assertion \"%s\" failed at %s:%d\n", a, file, line);
-	abort();
+eprint(const char *errstr, ...) {
+	va_list ap;
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(1);
 }
 
 void
-swap(void **p1, void **p2)
+spawn(Arg *arg)
 {
-	void *tmp = *p1;
-	*p1 = *p2;
-	*p2 = tmp;
+	char **argv = (char **)arg->argv;
+	if(!argv || !argv[0])
+		return;
+	if(fork() == 0) {
+		if(fork() == 0) {
+			if(dpy)
+				close(ConnectionNumber(dpy));
+			setsid();
+			execvp(argv[0], argv);
+			fprintf(stderr, "dwm: execvp %s", argv[0]);
+			perror(" failed");
+		}
+		exit (0);
+	}
+	wait(0);
 }