X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=util.c;h=1d379061238f4e522b6a9f7ad22e7b8ea50fc4bc;hp=de4df9857b52bc6e3b60027e2945251fb9c7f6e9;hb=8b59083eb13c0712e04d9a5b6d7bf4af5913c442;hpb=3a69c5173cdd24959410870bec2a10a76272e034

diff --git a/util.c b/util.c
index de4df98..1d37906 100644
--- a/util.c
+++ b/util.c
@@ -11,9 +11,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "util.h"
-
-static char *shell = NULL;
+#include "wm.h"
 
 void
 error(char *errstr, ...) {
@@ -62,20 +60,13 @@ erealloc(void *ptr, unsigned int size)
 char *
 estrdup(const char *str)
 {
-	void *res = strdup(str);
+	char *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)
 {
 	void *tmp = *p1;
@@ -84,65 +75,20 @@ swap(void **p1, void **p2)
 }
 
 void
-spawn(Display *dpy, const char *cmd)
+spawn(Display *dpy, char *argv[])
 {
-	if(!shell && !(shell = getenv("SHELL")))
-		shell = "/bin/sh";
-
-	if(!cmd)
+	if(!argv || !argv[0])
 		return;
 	if(fork() == 0) {
 		if(fork() == 0) {
-			setsid();
 			if(dpy)
 				close(ConnectionNumber(dpy));
-			execlp(shell, "shell", "-c", cmd, NULL);
-			fprintf(stderr, "gridwm: execvp %s", cmd);
+			setsid();
+			execvp(argv[0], argv);
+			fprintf(stderr, "gridwm: execvp %s", argv[0]);
 			perror(" failed");
 		}
 		exit (0);
 	}
 	wait(0);
 }
-
-void
-pipe_spawn(char *buf, unsigned int len, Display *dpy, const char *cmd)
-{
-	unsigned int l, n;
-	int pfd[2];
-
-	if(!shell && !(shell = getenv("SHELL")))
-		shell = "/bin/sh";
-
-	if(!cmd)
-		return;
-
-	if(pipe(pfd) == -1) {
-		perror("pipe");
-		exit(1);
-	}
-
-	if(fork() == 0) {
-		setsid();
-		if(dpy)
-			close(ConnectionNumber(dpy));
-		dup2(pfd[1], STDOUT_FILENO);
-		close(pfd[0]);
-		close(pfd[1]);
-		execlp(shell, "shell", "-c", cmd, NULL);
-		fprintf(stderr, "gridwm: execvp %s", cmd);
-		perror(" failed");
-	}
-	else {
-		n = 0;
-		close(pfd[1]);
-		while(l > n) {
-			if((l = read(pfd[0], buf + n, len - n)) < 1)
-				break;
-			n += l;
-		}
-		close(pfd[0]);
-		buf[n - 1] = 0;
-	}
-	wait(0);
-}