# HG changeset patch
# User a@null
# Date 1229111703 0
# Node ID fcdbbc9c39de5bfccb9acb195aec79ec3e4fb3aa
# Parent  6d6ed7a9183cd4faa3a8393a3482e468d939a32b
re-applied Neale's spawn patch, credited Neale in LICENSE

diff -r 6d6ed7a9183c -r fcdbbc9c39de LICENSE
--- a/LICENSE	Fri Dec 12 19:49:06 2008 +0000
+++ b/LICENSE	Fri Dec 12 19:55:03 2008 +0000
@@ -9,6 +9,7 @@
 © 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
 © 2007-2008 Peter Hartlich <sgkkr at hartlich dot com>
 © 2008 Martin Hurton <martin dot hurton at gmail dot com>
+© 2008 Neale Pickett <neale dot woozle dot org>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff -r 6d6ed7a9183c -r fcdbbc9c39de README
--- a/README	Fri Dec 12 19:49:06 2008 +0000
+++ b/README	Fri Dec 12 19:55:03 2008 +0000
@@ -38,11 +38,12 @@
 In order to display status info in the bar, you can do something
 like this in your .xinitrc:
 
+    dwm &
     while true
     do
         xsetroot -name "`date` `uptime | sed 's/.*,//'`"
         sleep 1
-    done | dwm
+    done
 
 
 Configuration
diff -r 6d6ed7a9183c -r fcdbbc9c39de config.mk
--- a/config.mk	Fri Dec 12 19:49:06 2008 +0000
+++ b/config.mk	Fri Dec 12 19:55:03 2008 +0000
@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 5.3.1
+VERSION = 5.4
 
 # Customize below to fit your system
 
diff -r 6d6ed7a9183c -r fcdbbc9c39de dwm.c
--- a/dwm.c	Fri Dec 12 19:49:06 2008 +0000
+++ b/dwm.c	Fri Dec 12 19:55:03 2008 +0000
@@ -178,6 +178,7 @@
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void showhide(Client *c);
+static void sigchld(int signal);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static int textnw(const char *text, unsigned int len);
@@ -1340,22 +1341,24 @@
 	}
 }
 
+
+void
+sigchld(int signal) {
+	while(0 < waitpid(-1, NULL, WNOHANG));
+}
+
 void
 spawn(const Arg *arg) {
-	/* The double-fork construct avoids zombie processes and keeps the code
-	 * clean from stupid signal handlers. */
+	signal(SIGCHLD, sigchld);
 	if(fork() == 0) {
-		if(fork() == 0) {
-			if(dpy)
-				close(ConnectionNumber(dpy));
-			setsid();
-			execvp(((char **)arg->v)[0], (char **)arg->v);
-			fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
-			perror(" failed");
-		}
+		if(dpy)
+			close(ConnectionNumber(dpy));
+		setsid();
+		execvp(((char **)arg->v)[0], (char **)arg->v);
+		fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
+		perror(" failed");
 		exit(0);
 	}
-	wait(0);
 }
 
 void