X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=util.c;h=99d7bebb773c42658a79032ba566986f54d401dc;hb=08d85d6d66bc4493414d76e470e473fa689c5990;hp=6eb19b494ec93d5cf4c0640e8cfcad7d6e3601a0;hpb=0464e42231199d7a6ea45e46cf7798f2b6cf972c;p=dwm.git

diff --git a/util.c b/util.c
index 6eb19b4..99d7beb 100644
--- 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>
@@ -13,7 +12,7 @@
 /* static */
 
 static void
-bad_malloc(unsigned int size)
+badmalloc(unsigned int size)
 {
 	eprint("fatal: could not malloc() %u bytes\n", size);
 }
@@ -26,12 +25,13 @@ emallocz(unsigned int size)
 	void *res = calloc(1, size);
 
 	if(!res)
-		bad_malloc(size);
+		badmalloc(size);
 	return res;
 }
 
 void
-eprint(const char *errstr, ...) {
+eprint(const char *errstr, ...)
+{
 	va_list ap;
 
 	va_start(ap, errstr);
@@ -40,20 +40,32 @@ eprint(const char *errstr, ...) {
 	exit(EXIT_FAILURE);
 }
 
+void *
+erealloc(void *ptr, unsigned int size)
+{
+	void *res = realloc(ptr, size);
+	if(!res)
+		badmalloc(size);
+	return res;
+}
+
 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 -c %s'", shell, arg->cmd);
 			perror(" failed");
 		}
 		exit(0);