X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/ba703386fd742f46f83430a7c48a9bfe53167eae..b073e347cce9f17f137cbd961a36c75b30a22148:/process.c

diff --git a/process.c b/process.c
index a15e3a6..f836258 100644
--- a/process.c
+++ b/process.c
@@ -45,7 +45,7 @@ pid_t makesubproc(process_entry_fn *entry, process_callback_fn *cb,
     struct child *c;
     pid_t p;
 
-    c=safe_malloc(sizeof(*c),"makesubproc");
+    NEW(c);
     c->desc=desc;
     c->cb=cb;
     c->cst=cst;
@@ -92,7 +92,7 @@ static void sigchld_handler(void *st, int signum)
 	if (rv==i->pid) {
 	    i->finished=True;
 	    
-	    nw=safe_malloc(sizeof(*nw),"sigchld_handler");
+	    NEW(nw);
 	    nw->pid=i->pid;
 	    nw->cb=i->cb;
 	    nw->cst=i->cst;
@@ -218,6 +218,10 @@ void afterfork(void)
     sigset_t done;
     struct sigaction sa;
 
+    clear_phase_hooks(PHASE_SHUTDOWN);
+    /* Prevents calls to fatal() etc. in the child from running off
+       and doing a lot of unhelpful things */
+
     sigemptyset(&done);
     for (n=sigs; n; n=n->next)
 	if (!sigismember(&done,n->signum)) {
@@ -232,6 +236,16 @@ void afterfork(void)
     sigprocmask(SIG_SETMASK,&emptyset,NULL);
 }
 
+void childpersist_closefd_hook(void *fd_vp, uint32_t newphase)
+{
+    int *fd_p=fd_vp;
+    int fd=*fd_p;
+    if (fd<0) return;
+    *fd_p=-1;
+    setnonblock(fd); /* in case close() might block */
+    close(fd); /* discard errors - we don't care, in the child */
+}
+
 static void signal_handler(int signum)
 {
     int saved_errno;
@@ -277,7 +291,7 @@ void request_signal_notification(int signum, signal_notify_fn *notify,
     struct signotify *s;
     sigset_t old;
 
-    s=safe_malloc(sizeof(*s),"request_signal_notification");
+    NEW(s);
     s->signum=signum;
     s->notify=notify;
     s->cst=cst;