aboutsummaryrefslogtreecommitdiff
path: root/runit/runsv.c
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-01-27 22:21:52 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-01-27 22:21:52 +0000
commit8c7839512039212ba88e48d856d0ac9835fdec67 (patch)
tree4aa5cb8737ab74799096cb8560180890aa2bb5d7 /runit/runsv.c
parente06bed30cfcde7b9e320aff8a4c878c72416c4c4 (diff)
downloadbusybox-8c7839512039212ba88e48d856d0ac9835fdec67.tar.gz
busybox-8c7839512039212ba88e48d856d0ac9835fdec67.tar.bz2
runit cleanup part 1
Diffstat (limited to 'runit/runsv.c')
-rw-r--r--runit/runsv.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/runit/runsv.c b/runit/runsv.c
index aace041a8..24a51f2b1 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -307,10 +307,10 @@ static void startservice(struct svdir *s)
close(logpipe[0]);
}
}
- sig_uncatch(sig_child);
- sig_unblock(sig_child);
- sig_uncatch(sig_term);
- sig_unblock(sig_term);
+ sig_uncatch(SIGCHLD);
+ sig_unblock(SIGCHLD);
+ sig_uncatch(SIGTERM);
+ sig_unblock(SIGTERM);
execve(*run, run, environ);
if (s->islog)
fatal2_cannot("start log/", *run);
@@ -406,10 +406,10 @@ int runsv_main(int argc, char **argv)
ndelay_on(selfpipe[0]);
ndelay_on(selfpipe[1]);
- sig_block(sig_child);
- sig_catch(sig_child, s_child);
- sig_block(sig_term);
- sig_catch(sig_term, s_term);
+ sig_block(SIGCHLD);
+ sig_catch(SIGCHLD, s_child);
+ sig_block(SIGTERM);
+ sig_catch(SIGTERM, s_term);
xchdir(dir);
svd[0].pid = 0;
@@ -533,11 +533,11 @@ int runsv_main(int argc, char **argv)
taia_uint(&deadline, 3600);
taia_add(&deadline, &now, &deadline);
- sig_unblock(sig_term);
- sig_unblock(sig_child);
+ sig_unblock(SIGTERM);
+ sig_unblock(SIGCHLD);
iopause(x, 2+haslog, &deadline, &now);
- sig_block(sig_term);
- sig_block(sig_child);
+ sig_block(SIGTERM);
+ sig_block(SIGCHLD);
while (read(selfpipe[0], &ch, 1) == 1)
;