X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=util.c;h=e95dfc5f946c623774a30e41105af613d8f36b36;hb=a1d0f819661f2be48f7a03ddd001f2a1a8f325e4;hp=435069f9903703412fe2edfc3514058d01014959;hpb=439e15d09f6fa9271d3b49ef97194f0c80ebe161;p=dwm.git

diff --git a/util.c b/util.c
index 435069f..e95dfc5 100644
--- a/util.c
+++ b/util.c
@@ -6,15 +6,14 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "util.h"
+#include "dwm.h"
 
 void
-error(char *errstr, ...) {
+error(const char *errstr, ...) {
 	va_list ap;
 	va_start(ap, errstr);
 	vfprintf(stderr, errstr, ap);
@@ -39,40 +38,6 @@ 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();
-}
-
 void
 swap(void **p1, void **p2)
 {
@@ -82,16 +47,18 @@ swap(void **p1, void **p2)
 }
 
 void
-spawn(Display *dpy, const char *shell, const char *cmd)
+spawn(Arg *arg)
 {
-	if(!cmd || !shell)
+	char **argv = (char **)arg->argv;
+	if(!argv || !argv[0])
 		return;
 	if(fork() == 0) {
 		if(fork() == 0) {
 			if(dpy)
 				close(ConnectionNumber(dpy));
-			execl(shell, shell, "-c", cmd, (const char *)0);
-			fprintf(stderr, "gridwm: execl %s", shell);
+			setsid();
+			execvp(argv[0], argv);
+			fprintf(stderr, "dwm: execvp %s", argv[0]);
 			perror(" failed");
 		}
 		exit (0);