summaryrefslogtreecommitdiff
path: root/runit
diff options
context:
space:
mode:
Diffstat (limited to 'runit')
-rw-r--r--runit/runsv.c10
-rw-r--r--runit/runsvdir.c10
-rw-r--r--runit/svlogd.c16
3 files changed, 21 insertions, 15 deletions
diff --git a/runit/runsv.c b/runit/runsv.c
index e1d99e2..02271d6 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -345,8 +345,10 @@ static void startservice(struct svdir *s)
xdup2(logpipe.wr, 1);
}
}
- signal(SIGCHLD, SIG_DFL);
- signal(SIGTERM, SIG_DFL);
+ bb_signals(0
+ + (1 << SIGCHLD)
+ + (1 << SIGTERM)
+ , SIG_DFL);
sig_unblock(SIGCHLD);
sig_unblock(SIGTERM);
execvp(*run, run);
@@ -460,9 +462,9 @@ int runsv_main(int argc, char **argv)
ndelay_on(selfpipe.wr);
sig_block(SIGCHLD);
- sig_catch(SIGCHLD, s_child);
+ bb_signals_recursive(1 << SIGCHLD, s_child);
sig_block(SIGTERM);
- sig_catch(SIGTERM, s_term);
+ bb_signals_recursive(1 << SIGTERM, s_term);
xchdir(dir);
/* bss: svd[0].pid = 0; */
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index 4225ac1..3ff1d4c 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -100,8 +100,10 @@ static void runsv(int no, const char *name)
/* child */
if (set_pgrp)
setsid();
- signal(SIGHUP, SIG_DFL);
- signal(SIGTERM, SIG_DFL);
+ bb_signals(0
+ + (1 << SIGHUP)
+ + (1 << SIGTERM)
+ , SIG_DFL);
execvp(prog[0], prog);
fatal2_cannot("start runsv ", name);
}
@@ -232,8 +234,8 @@ int runsvdir_main(int argc, char **argv)
bb_show_usage();
}
- sig_catch(SIGTERM, s_term);
- sig_catch(SIGHUP, s_hangup);
+ bb_signals_recursive(1 << SIGTERM, s_term);
+ bb_signals_recursive(1 << SIGHUP, s_hangup);
svdir = *argv++;
if (argv && *argv) {
rplog = *argv;
diff --git a/runit/svlogd.c b/runit/svlogd.c
index 9c169da..73570da 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -222,9 +222,11 @@ static unsigned processorstart(struct logdir *ld)
int fd;
/* child */
- signal(SIGTERM, SIG_DFL);
- signal(SIGALRM, SIG_DFL);
- signal(SIGHUP, SIG_DFL);
+ bb_signals(0
+ + (1 << SIGTERM)
+ + (1 << SIGALRM)
+ + (1 << SIGHUP)
+ , SIG_DFL);
sig_unblock(SIGTERM);
sig_unblock(SIGALRM);
sig_unblock(SIGHUP);
@@ -903,10 +905,10 @@ int svlogd_main(int argc, char **argv)
sigaddset(&blocked_sigset, SIGALRM);
sigaddset(&blocked_sigset, SIGHUP);
sigprocmask(SIG_BLOCK, &blocked_sigset, NULL);
- sig_catch(SIGTERM, sig_term_handler);
- sig_catch(SIGCHLD, sig_child_handler);
- sig_catch(SIGALRM, sig_alarm_handler);
- sig_catch(SIGHUP, sig_hangup_handler);
+ bb_signals_recursive(1 << SIGTERM, sig_term_handler);
+ bb_signals_recursive(1 << SIGCHLD, sig_child_handler);
+ bb_signals_recursive(1 << SIGALRM, sig_alarm_handler);
+ bb_signals_recursive(1 << SIGHUP, sig_hangup_handler);
logdirs_reopen();