From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Mon, 1 Nov 2010 20:54:16 +0000 (+0100)
Subject: dirplex, patplex: Really wait for children.
X-Git-Tag: 0.5~8
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=578ad6b1de34230e8fe64116b16380c1441ef9dd

dirplex, patplex: Really wait for children.
---

diff --git a/src/dirplex/dirplex.c b/src/dirplex/dirplex.c
index 31920e6..d5aabea 100644
--- a/src/dirplex/dirplex.c
+++ b/src/dirplex/dirplex.c
@@ -25,6 +25,7 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <time.h>
+#include <sys/wait.h>
 #include <sys/signal.h>
 
 #ifdef HAVE_CONFIG_H
@@ -296,6 +297,15 @@ static void serve(struct hthead *req, int fd)
 	simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
 }
 
+static void chldhandler(int sig)
+{
+    pid_t pid;
+    
+    do {
+	pid = waitpid(-1, NULL, WNOHANG);
+    } while(pid > 0);
+}
+
 static void sighandler(int sig)
 {
 }
@@ -359,7 +369,7 @@ int main(int argc, char **argv)
 	flog(LOG_ERR, "could not change directory to %s: %s", argv[optind], strerror(errno));
 	exit(1);
     }
-    signal(SIGCHLD, SIG_IGN);
+    signal(SIGCHLD, chldhandler);
     signal(SIGPIPE, sighandler);
     while(1) {
 	if((fd = recvreq(0, &req)) < 0) {
diff --git a/src/patplex.c b/src/patplex.c
index 8394406..3b3d7f9 100644
--- a/src/patplex.c
+++ b/src/patplex.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <regex.h>
+#include <sys/wait.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -464,6 +465,15 @@ static void reloadconf(char *nm)
     lconfig = cf;
 }
 
+static void chldhandler(int sig)
+{
+    pid_t pid;
+    
+    do {
+	pid = waitpid(-1, NULL, WNOHANG);
+    } while(pid > 0);
+}
+
 static void sighandler(int sig)
 {
     if(sig == SIGHUP)
@@ -511,7 +521,7 @@ int main(int argc, char **argv)
 	flog(LOG_ERR, "could not read `%s'", argv[optind]);
 	exit(1);
     }
-    signal(SIGCHLD, SIG_IGN);
+    signal(SIGCHLD, chldhandler);
     signal(SIGHUP, sighandler);
     signal(SIGPIPE, sighandler);
     while(1) {