removed spow(x, 0); calls, I did them for consistency's sake, but it should be rather...

[dwm.git] / util.c

diff --git a/util.c b/util.c
index 990ad28..d39d73c 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,7 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */

 #include "dwm.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include "dwm.h"
 #include <stdarg.h>
 #include <stdio.h>


@@ -9,29 +6,19 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
 #include <sys/wait.h>
 #include <unistd.h>
 

-/* static */
-
-static void
-bad_malloc(unsigned int size)
-{
-       eprint("fatal: could not malloc() %u bytes\n", size);
-}
-

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

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

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

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

        return res;
 }
 
 void
        return res;
 }
 
 void

-eprint(const char *errstr, ...)
-{
+eprint(const char *errstr, ...) {

        va_list ap;
 
        va_start(ap, errstr);
        va_list ap;
 
        va_start(ap, errstr);


@@ -41,22 +28,22 @@ eprint(const char *errstr, ...)
 }
 
 void
 }
 
 void

-spawn(Arg *arg)
-{
+spawn(const char *arg) {

        static char *shell = NULL;
 
        if(!shell && !(shell = getenv("SHELL")))
                shell = "/bin/sh";
        static char *shell = NULL;
 
        if(!shell && !(shell = getenv("SHELL")))
                shell = "/bin/sh";

-
-       if(!arg->cmd)
+       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();

-                       execl(shell, shell, "-c", arg->cmd, NULL);
-                       fprintf(stderr, "dwm: execl '%s'", arg->cmd);
+                       execl(shell, shell, "-c", arg, (char *)NULL);
+                       fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);

                        perror(" failed");
                }
                exit(0);
                        perror(" failed");
                }
                exit(0);