diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-27 22:21:52 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-27 22:21:52 +0000 |
| commit | 8c7839512039212ba88e48d856d0ac9835fdec67 (patch) | |
| tree | 4aa5cb8737ab74799096cb8560180890aa2bb5d7 /runit/runsvdir.c | |
| parent | e06bed30cfcde7b9e320aff8a4c878c72416c4c4 (diff) | |
| download | busybox-8c7839512039212ba88e48d856d0ac9835fdec67.tar.gz | |
runit cleanup part 1
Diffstat (limited to 'runit/runsvdir.c')
| -rw-r--r-- | runit/runsvdir.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runit/runsvdir.c b/runit/runsvdir.c index 3290da5e6..41581a8c8 100644 --- a/runit/runsvdir.c +++ b/runit/runsvdir.c @@ -70,8 +70,8 @@ static void runsv(int no, char *name) prog[0] = "runsv"; prog[1] = name; prog[2] = 0; - sig_uncatch(sig_hangup); - sig_uncatch(sig_term); + sig_uncatch(SIGHUP); + sig_uncatch(SIGTERM); if (pgrp) setsid(); execvp(prog[0], prog); //pathexec_run(*prog, prog, (char* const*)environ); @@ -197,8 +197,8 @@ int runsvdir_main(int argc, char **argv) if (!argv || !*argv) usage(); } - sig_catch(sig_term, s_term); - sig_catch(sig_hangup, s_hangup); + sig_catch(SIGTERM, s_term); + sig_catch(SIGHUP, s_hangup); svdir = *argv++; if (argv && *argv) { rplog = *argv; @@ -276,12 +276,12 @@ int runsvdir_main(int argc, char **argv) taia_uint(&deadline, check ? 1 : 5); taia_add(&deadline, &now, &deadline); - sig_block(sig_child); + sig_block(SIGCHLD); if (rplog) iopause(io, 1, &deadline, &now); else iopause(0, 0, &deadline, &now); - sig_unblock(sig_child); + sig_unblock(SIGCHLD); if (rplog && (io[0].revents | IOPAUSE_READ)) while (read(logpipe[0], &ch, 1) > 0) |