X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=util.c;h=b786480724e0648e16660dca22d8fb44498e7adf;hb=352cae4380713949d3800ebcda7aff3bb5ab9efc;hp=94590f9233e397ccccb0f971b3376befe8ddfab7;hpb=dc5d967ee61046f899b3b49daeb9268c8161844a;p=dwm.git

diff --git a/util.c b/util.c
index 94590f9..b786480 100644
--- a/util.c
+++ b/util.c
@@ -1,34 +1,21 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * 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)
-{
-	fprintf(stderr, "fatal: could not malloc() %d bytes\n",
-			(int) size);
-	exit(EXIT_FAILURE);
-}
-
 /* 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;
 }
 
@@ -43,22 +30,25 @@ eprint(const char *errstr, ...) {
 }
 
 void
-spawn(Arg *arg)
-{
-	char **argv = (char **)arg->argv;
+spawn(Arg arg) {
+	static char *shell = NULL;
 
-	if(!argv || !argv[0])
+	if(!shell && !(shell = getenv("SHELL")))
+		shell = "/bin/sh";
+	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();
-			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(EXIT_FAILURE);
+		exit(0);
 	}
 	wait(0);
 }