lib: Added more indirection for child handling.

[ashd.git] / src / patplex.c

diff --git a/src/patplex.c b/src/patplex.c
index 04b7a10..bf4fda9 100644 (file)
--- 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>
@@ -445,25 +446,25 @@ static void serve(struct hthead *req, int fd)
 static void reloadconf(char *nm)
 {
     struct config *cf;
-    struct child *ch1, *ch2;
     
     if((cf = readconfig(nm)) == NULL) {
        flog(LOG_WARNING, "could not reload configuration file `%s'", nm);
        return;
     }
-    for(ch1 = cf->children; ch1 != NULL; ch1 = ch1->next) {
-       for(ch2 = lconfig->children; ch2 != NULL; ch2 = ch2->next) {
-           if(!strcmp(ch1->name, ch2->name)) {
-               ch1->fd = ch2->fd;
-               ch2->fd = -1;
-               break;
-           }
-       }
-    }
+    mergechildren(cf->children, lconfig->children);
     freeconfig(lconfig);
     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,8 +512,9 @@ 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) {
        if(reload) {
            reloadconf(argv[optind]);