yet another fix of copyright compactisition

[dwm.git] / util.c

diff --git a/util.c b/util.c
index 3e5fd1e..7b94c50 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,61 +1,54 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */

 #include "dwm.h"
 #include "dwm.h"

-

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <unistd.h>
 

-/* static */
-
-static void
-bad_malloc(unsigned int size)
-{
-       fprintf(stderr, "fatal: could not malloc() %d bytes\n",
-                       (int) size);
-       exit(1);
-}
-

 /* extern */
 
 void *
 /* extern */
 
 void *

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

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

+

        if(!res)
        if(!res)

-               bad_malloc(size);
+               eprint("fatal: could not malloc() %u bytes\n", size);

        return res;
 }
 
 void
 eprint(const char *errstr, ...) {
        va_list ap;
        return res;
 }
 
 void
 eprint(const char *errstr, ...) {
        va_list ap;

+

        va_start(ap, errstr);
        vfprintf(stderr, errstr, ap);
        va_end(ap);
        va_start(ap, errstr);
        vfprintf(stderr, errstr, ap);
        va_end(ap);

-       exit(1);
+       exit(EXIT_FAILURE);

 }
 
 void
 }
 
 void

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

                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, "dwm: execvp %s", argv[0]);
+                       execl(shell, shell, "-c", arg, (char *)NULL);
+                       fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);

                        perror(" failed");
                }
                        perror(" failed");
                }

-               exit (0);
+               exit(0);

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