X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/b1669b5c48f71c9a7a919dbf09a1af527c62f69a..66da15324eef4f85c6dda13eba80430dc4cc97bb:/util.c?ds=inline

diff --git a/util.c b/util.c
index 76ba5ab..d8e6612 100644
--- a/util.c
+++ b/util.c
@@ -11,10 +11,10 @@
 #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);
@@ -60,19 +60,12 @@ 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)
 {
@@ -82,8 +75,9 @@ swap(void **p1, void **p2)
 }
 
 void
-spawn(Display *dpy, char *argv[])
+spawn(Arg *arg)
 {
+	char **argv = (char **)arg->argv;
 	if(!argv || !argv[0])
 		return;
 	if(fork() == 0) {
@@ -92,49 +86,10 @@ spawn(Display *dpy, char *argv[])
 				close(ConnectionNumber(dpy));
 			setsid();
 			execvp(argv[0], argv);
-			fprintf(stderr, "gridwm: execvp %s", argv[0]);
+			fprintf(stderr, "dwm: execvp %s", argv[0]);
 			perror(" failed");
 		}
 		exit (0);
 	}
 	wait(0);
 }
-
-void
-pipe_spawn(char *buf, unsigned int len, Display *dpy, char *argv[])
-{
-	unsigned int l, n;
-	int pfd[2];
-
-	if(!argv || !argv[0])
-		return;
-
-	if(pipe(pfd) == -1) {
-		perror("pipe");
-		exit(1);
-	}
-
-	if(fork() == 0) {
-		if(dpy)
-			close(ConnectionNumber(dpy));
-		setsid();
-		dup2(pfd[1], STDOUT_FILENO);
-		close(pfd[0]);
-		close(pfd[1]);
-		execvp(argv[0], argv);
-		fprintf(stderr, "gridwm: execvp %s", argv[0]);
-		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);
-}