next version is 3.5

[dwm.git] / util.c

diff --git a/util.c b/util.c
index 9da8f52..8b36a3f 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,140 +1,54 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
  * See LICENSE file for license details.
  */

-
+#include "dwm.h"

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <string.h>
-#include <sys/types.h>

 #include <sys/wait.h>
 #include <unistd.h>
 
 #include <sys/wait.h>
 #include <unistd.h>
 

-#include "util.h"
-
-void
-error(char *errstr, ...) {
-       va_list ap;
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(1);
-}
-
-static void
-bad_malloc(unsigned int size)
-{
-       fprintf(stderr, "fatal: could not malloc() %d bytes\n",
-                       (int) size);
-       exit(1);
-}
+/* extern */

 
 void *
 
 void *

-emallocz(unsigned int size)
-{
+emallocz(unsigned int size) {

        void *res = calloc(1, size);
        void *res = calloc(1, size);

-       if(!res)
-               bad_malloc(size);
-       return res;
-}

 
 

-void *
-emalloc(unsigned int size)
-{
-       void *res = malloc(size);

        if(!res)
        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));
+               eprint("fatal: could not malloc() %u bytes\n", size);

        return res;
 }
 
 void
        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;

 
 

-void
-swap(void **p1, void **p2)
-{
-       void *tmp = *p1;
-       *p1 = *p2;
-       *p2 = tmp;
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);

 }
 
 void
 }
 
 void

-spawn(Display *dpy, char *argv[])
-{
-       if(!argv || !argv[0])
+spawn(Arg *arg) {
+       static char *shell = NULL;
+
+       if(!shell && !(shell = getenv("SHELL")))
+               shell = "/bin/sh";
+       if(!arg->cmd)

                return;
                return;

+       /* The double-fork construct avoids zombie processes and keeps the code
+        * clean from stupid signal handlers. */

        if(fork() == 0) {
                if(fork() == 0) {
                        if(dpy)
                                close(ConnectionNumber(dpy));
                        setsid();
        if(fork() == 0) {
                if(fork() == 0) {
                        if(dpy)
                                close(ConnectionNumber(dpy));
                        setsid();

-                       execvp(argv[0], argv);
-                       fprintf(stderr, "gridwm: execvp %s", argv[0]);
+                       execl(shell, shell, "-c", arg->cmd, (char *)NULL);
+                       fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd);

                        perror(" failed");
                }
                        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 < len ? n : len - 1] = 0;
+               exit(0);

        }
        wait(0);
 }
        }
        wait(0);
 }