/*
* todo
- * - reset signals TERM and INT (and HUP) in children
- *
* - manpage: document control master stuff
* - admin-initiated flush
*
#define VA va_list al; va_start(al,fmt)
#define PRINTF(f,a) __attribute__((__format__(printf,f,a)))
#define NORET_PRINTF(f,a) __attribute__((__noreturn__,__format__(printf,f,a)))
+#define NORET __attribute__((__noreturn__))
#define NEW(ptr) ((ptr)= zxmalloc(sizeof(*(ptr))))
#define NEW_DECL(type,ptr) type ptr = zxmalloc(sizeof(*(ptr)))
static void close_defer(void);
static void search_backlog_file(void);
static void preterminate(void);
-static void raise_default(int signo);
+static void raise_default(int signo) NORET;
static char *debug_report_ipf(InputFile *ipf);
static void inputfile_reading_start(InputFile *ipf);
return now;
}
-static void xsigaction(int s, const struct sigaction *sa) {
- int r= sigaction(s,sa,0);
- if (r) sysdie("sigaction failed for \"%s\"", strsignal(s));
+static void xsigaction(int signo, const struct sigaction *sa) {
+ int r= sigaction(signo,sa,0);
+ if (r) sysdie("sigaction failed for \"%s\"", strsignal(signo));
+}
+
+static void xsigsetdefault(int signo) {
+ struct sigaction sa;
+ memset(&sa,0,sizeof(sa));
+ sa.sa_handler= SIG_DFL;
+ xsigaction(signo,&sa);
}
static void xgettimeofday(struct timeval *tv_r) {
static sig_atomic_t terminate_sig_flag;
static void raise_default(int signo) {
- struct sigaction sa;
- memset(&sa,0,sizeof(sa));
- sa.sa_handler= SIG_DFL;
- xsigaction(signo,&sa);
+ xsigsetdefault(signo);
raise(signo);
+ abort();
}
static void *sigarrived_event(oop_source *lp, int fd, oop_event e, void *u) {
preterminate();
notice("terminating (%s)", strsignal(terminate_sig_flag));
raise_default(terminate_sig_flag);
- abort();
}
return OOP_CONTINUE;
}
static void sigarrived_handler(int signum) {
static char x;
switch (signum) {
- case SIGINT: case SIGTERM:
+ case SIGTERM:
+ case SIGINT:
if (!terminate_sig_flag) terminate_sig_flag= signum;
break;
default:
static void postfork(void) {
in_child= 1;
- if (signal(SIGPIPE, SIG_DFL) == SIG_ERR)
- sysdie("(in child) failed to reset SIGPIPE");
+ xsigsetdefault(SIGTERM);
+ xsigsetdefault(SIGINT);
+ xsigsetdefault(SIGPIPE);
+ if (terminate_sig_flag) raise(terminate_sig_flag);
postfork_inputfile(main_input_file);
postfork_inputfile(flushing_input_file);