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

diff --git a/util.c b/util.c
index 6eb19b4..7d7cb1a 100644
--- a/util.c
+++ b/util.c
@@ -1,32 +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)
-{
-	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 +29,32 @@ 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(!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(0);