From 8b59083eb13c0712e04d9a5b6d7bf4af5913c442 Mon Sep 17 00:00:00 2001 From: "Anselm R. Garbe" Date: Thu, 13 Jul 2006 01:30:55 +0200 Subject: removed unnecessary crap --- util.c | 51 ++------------------------------------------------- 1 file changed, 2 insertions(+), 49 deletions(-) (limited to 'util.c') diff --git a/util.c b/util.c index 3f41b3c..1d37906 100644 --- a/util.c +++ b/util.c @@ -11,7 +11,7 @@ #include #include -#include "util.h" +#include "wm.h" void error(char *errstr, ...) { @@ -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) { @@ -99,43 +92,3 @@ spawn(Display *dpy, char *argv[]) } 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 { - l = n = 0; - close(pfd[1]); - while(n < len) { - if((l = read(pfd[0], buf + n, len - n)) < 1) - break; - n += l; - } - while(l > n); - close(pfd[0]); - buf[n < len ? n : len - 1] = 0; - } - wait(0); -} -- cgit v1.2.3-54-g00ecf