using execl now, argv changed, using cmd and const char defs directly in the KEYS...

[dwm.git] / util.c

diff --git a/util.c b/util.c
index 6eb19b4..990ad28 100644 (file)
--- a/util.c
+++ b/util.c
@@ -3,7 +3,6 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,7 +30,8 @@ emallocz(unsigned int size)
 }
 
 void
-eprint(const char *errstr, ...) {
+eprint(const char *errstr, ...)
+{
        va_list ap;
 
        va_start(ap, errstr);
@@ -43,17 +43,20 @@ eprint(const char *errstr, ...) {
 void
 spawn(Arg *arg)
 {
-       char **argv = (char **)arg->argv;
+       static char *shell = NULL;
+
+       if(!shell && !(shell = getenv("SHELL")))
+               shell = "/bin/sh";
 
-       if(!argv || !argv[0])
+       if(!arg->cmd)
                return;
        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, NULL);
+                       fprintf(stderr, "dwm: execl '%s'", arg->cmd);
                        perror(" failed");
                }
                exit(0);