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

diff --git a/util.c b/util.c
index 99d7beb..1147133 100644
--- a/util.c
+++ b/util.c
@@ -9,29 +9,19 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-/* static */
-
-static void
-badmalloc(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)
-		badmalloc(size);
+		eprint("fatal: could not malloc() %u bytes\n", size);
 	return res;
 }
 
 void
-eprint(const char *errstr, ...)
-{
+eprint(const char *errstr, ...) {
 	va_list ap;
 
 	va_start(ap, errstr);
@@ -41,17 +31,15 @@ eprint(const char *errstr, ...)
 }
 
 void *
-erealloc(void *ptr, unsigned int size)
-{
+erealloc(void *ptr, unsigned int size) {
 	void *res = realloc(ptr, size);
 	if(!res)
-		badmalloc(size);
+		eprint("fatal: could not malloc() %u bytes\n", size);
 	return res;
 }
 
 void
-spawn(Arg *arg)
-{
+spawn(Arg *arg) {
 	static char *shell = NULL;
 
 	if(!shell && !(shell = getenv("SHELL")))
@@ -59,12 +47,13 @@ spawn(Arg *arg)
 
 	if(!arg->cmd)
 		return;
+	/* the double-fork construct avoids zombie processes */
 	if(fork() == 0) {
 		if(fork() == 0) {
 			if(dpy)
 				close(ConnectionNumber(dpy));
 			setsid();
-			execl(shell, shell, "-c", arg->cmd, NULL);
+			execl(shell, shell, "-c", arg->cmd, (char *)NULL);
 			fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd);
 			perror(" failed");
 		}