removed a bunch of lines through making function signatures more consistent with...

[dwm.git] / util.c

diff --git a/util.c b/util.c
index 6eb19b4..1147133 100644 (file)
--- a/util.c
+++ b/util.c
@@ -3,30 +3,20 @@
  * See LICENSE file for license details.
  */
 #include "dwm.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)
-{
-       eprint("fatal: could not malloc() %u bytes\n", size);
-}
-
 /* extern */
 
 void *
-emallocz(unsigned int size)
-{
+emallocz(unsigned int size) {
        void *res = calloc(1, size);
 
        if(!res)
-               bad_malloc(size);
+               eprint("fatal: could not malloc() %u bytes\n", size);
        return res;
 }
 
@@ -40,20 +30,31 @@ eprint(const char *errstr, ...) {
        exit(EXIT_FAILURE);
 }
 
+void *
+erealloc(void *ptr, unsigned int size) {
+       void *res = realloc(ptr, size);
+       if(!res)
+               eprint("fatal: could not malloc() %u bytes\n", size);
+       return res;
+}
+
 void
-spawn(Arg *arg)
-{
-       char **argv = (char **)arg->argv;
+spawn(Arg *arg) {
+       static char *shell = NULL;
+
+       if(!shell && !(shell = getenv("SHELL")))
+               shell = "/bin/sh";
 
-       if(!argv || !argv[0])
+       if(!arg->cmd)
                return;
+       /* the double-fork construct avoids zombie processes */
        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->cmd, (char *)NULL);
+                       fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd);
                        perror(" failed");
                }
                exit(0);