applied ality's hardcode-0 patches

[dwm.git] / util.c

diff --git a/util.c b/util.c
index 2eb9eb2..c31d7f9 100644 (file)
--- a/util.c
+++ b/util.c
@@ -12,8 +12,7 @@
 /* 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)


@@ -22,8 +21,7 @@ emallocz(unsigned int size)
 }
 
 void
 }
 
 void

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

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


@@ -33,8 +31,7 @@ eprint(const char *errstr, ...)
 }
 
 void *
 }
 
 void *

-erealloc(void *ptr, unsigned int size)
-{
+erealloc(void *ptr, unsigned int size) {

        void *res = realloc(ptr, size);
        if(!res)
                eprint("fatal: could not malloc() %u bytes\n", size);
        void *res = realloc(ptr, size);
        if(!res)
                eprint("fatal: could not malloc() %u bytes\n", size);


@@ -42,8 +39,7 @@ erealloc(void *ptr, unsigned int size)
 }
 
 void
 }
 
 void

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

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


@@ -51,12 +47,14 @@ spawn(Arg *arg)
 
        if(!arg->cmd)
                return;
 
        if(!arg->cmd)
                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);
+                       execl(shell, shell, "-c", arg->cmd, (char *)NULL);

                        fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd);
                        perror(" failed");
                }
                        fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd);
                        perror(" failed");
                }