struct child *c;
pid_t p;
- c=safe_malloc(sizeof(*c),"makesubproc");
+ NEW(c);
c->desc=desc;
c->cb=cb;
c->cst=cst;
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;
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)) {
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;
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;
pipe_cloexec(p);
spw=p[1];
spr=p[0];
- if (fcntl(spw, F_SETFL, fcntl(spw, F_GETFL)|O_NONBLOCK)==-1) {
- fatal_perror("start_signal_handling: fcntl(O_NONBLOCK)");
- }
+ setnonblock(spw);
+ setnonblock(spr);
register_for_poll(NULL,signal_beforepoll,signal_afterpoll,"signal");
signal_handling=True;