diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-16 22:58:56 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-16 22:58:56 +0000 |
commit | 25591c322c9305bd54d3ab80cfaf01ef87640d77 (patch) | |
tree | 66ce77758e35f4faa2d5f611d0535365f2cba00a /networking | |
parent | 7fc294cdfe1e7f4a12c44f984a698b0c0f609075 (diff) | |
download | busybox-w32-25591c322c9305bd54d3ab80cfaf01ef87640d77.tar.gz busybox-w32-25591c322c9305bd54d3ab80cfaf01ef87640d77.tar.bz2 busybox-w32-25591c322c9305bd54d3ab80cfaf01ef87640d77.zip |
libbb: introduce bb_signals and bb_signals_recursive,
which sets same handler for many signals. sig_catch is nuked
(bb_signals_recursive is more descriptive name).
*: use them as appropriate.
function old new delta
bb_signals_recursive - 95 +95
bb_signals - 52 +52
run_command 258 273 +15
svlogd_main 1368 1377 +9
runsv_main 1746 1752 +6
runsvdir_main 1643 1646 +3
UNSPEC_print 64 66 +2
time_main 1128 1127 -1
...
resize_main 246 210 -36
sig_catch 63 - -63
set_fatal_sighandler 85 14 -71
------------------------------------------------------------------------------
(add/remove: 2/1 grow/shrink: 5/24 up/down: 182/-548) Total: -366 bytes
Diffstat (limited to 'networking')
-rw-r--r-- | networking/dnsd.c | 10 | ||||
-rw-r--r-- | networking/nc_bloaty.c | 14 | ||||
-rw-r--r-- | networking/sendmail.c | 6 | ||||
-rw-r--r-- | networking/slattach.c | 10 | ||||
-rw-r--r-- | networking/telnetd.c | 3 | ||||
-rw-r--r-- | networking/udhcp/signalpipe.c | 8 |
6 files changed, 31 insertions, 20 deletions
diff --git a/networking/dnsd.c b/networking/dnsd.c index 5e7886167..0a5278377 100644 --- a/networking/dnsd.c +++ b/networking/dnsd.c | |||
@@ -361,14 +361,16 @@ int dnsd_main(int argc, char **argv) | |||
361 | dnsentryinit(); | 361 | dnsentryinit(); |
362 | 362 | ||
363 | signal(SIGINT, interrupt); | 363 | signal(SIGINT, interrupt); |
364 | /* why? signal(SIGPIPE, SIG_IGN); */ | 364 | bb_signals(0 |
365 | signal(SIGHUP, SIG_IGN); | 365 | /* why? + (1 << SIGPIPE) */ |
366 | + (1 << SIGHUP) | ||
366 | #ifdef SIGTSTP | 367 | #ifdef SIGTSTP |
367 | signal(SIGTSTP, SIG_IGN); | 368 | + (1 << SIGTSTP) |
368 | #endif | 369 | #endif |
369 | #ifdef SIGURG | 370 | #ifdef SIGURG |
370 | signal(SIGURG, SIG_IGN); | 371 | + (1 << SIGURG) |
371 | #endif | 372 | #endif |
373 | , SIG_IGN); | ||
372 | 374 | ||
373 | lsa = xdotted2sockaddr(listen_interface, port); | 375 | lsa = xdotted2sockaddr(listen_interface, port); |
374 | udps = xsocket(lsa->u.sa.sa_family, SOCK_DGRAM, 0); | 376 | udps = xsocket(lsa->u.sa.sa_family, SOCK_DGRAM, 0); |
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c index 206c5e5d9..853577aef 100644 --- a/networking/nc_bloaty.c +++ b/networking/nc_bloaty.c | |||
@@ -683,14 +683,18 @@ int nc_main(int argc, char **argv) | |||
683 | PTR_TO_GLOBALS = xzalloc(sizeof(G)); | 683 | PTR_TO_GLOBALS = xzalloc(sizeof(G)); |
684 | 684 | ||
685 | /* catch a signal or two for cleanup */ | 685 | /* catch a signal or two for cleanup */ |
686 | signal(SIGINT, catch); | 686 | bb_signals(0 |
687 | signal(SIGQUIT, catch); | 687 | + (1 << SIGINT) |
688 | signal(SIGTERM, catch); | 688 | + (1 << SIGQUIT) |
689 | + (1 << SIGTERM) | ||
690 | , catch); | ||
689 | /* and suppress others... */ | 691 | /* and suppress others... */ |
692 | bb_signals(0 | ||
690 | #ifdef SIGURG | 693 | #ifdef SIGURG |
691 | signal(SIGURG, SIG_IGN); | 694 | + (1 << SIGURG) |
692 | #endif | 695 | #endif |
693 | signal(SIGPIPE, SIG_IGN); /* important! */ | 696 | + (1 << SIGPIPE) /* important! */ |
697 | , SIG_IGN); | ||
694 | 698 | ||
695 | proggie = argv; | 699 | proggie = argv; |
696 | while (*++proggie) { | 700 | while (*++proggie) { |
diff --git a/networking/sendmail.c b/networking/sendmail.c index 63305d149..fa995abf4 100644 --- a/networking/sendmail.c +++ b/networking/sendmail.c | |||
@@ -111,8 +111,10 @@ static void launch_helper(const char **argv) | |||
111 | _exit(127); | 111 | _exit(127); |
112 | } | 112 | } |
113 | // parent - check whether child is alive | 113 | // parent - check whether child is alive |
114 | sig_catch(SIGCHLD, signal_handler); | 114 | bb_signals_recursive(0 |
115 | sig_catch(SIGALRM, signal_handler); | 115 | + (1 << SIGCHLD) |
116 | + (1 << SIGALRM) | ||
117 | , signal_handler); | ||
116 | signal_handler(SIGCHLD); | 118 | signal_handler(SIGCHLD); |
117 | // child seems OK -> parent goes on | 119 | // child seems OK -> parent goes on |
118 | } | 120 | } |
diff --git a/networking/slattach.c b/networking/slattach.c index 17df4fa9e..e501d82e1 100644 --- a/networking/slattach.c +++ b/networking/slattach.c | |||
@@ -175,10 +175,12 @@ int slattach_main(int argc, char **argv) | |||
175 | 175 | ||
176 | /* Trap signals in order to restore tty states upon exit */ | 176 | /* Trap signals in order to restore tty states upon exit */ |
177 | if (!(opt & OPT_e_quit)) { | 177 | if (!(opt & OPT_e_quit)) { |
178 | signal(SIGHUP, sig_handler); | 178 | bb_signals(0 |
179 | signal(SIGINT, sig_handler); | 179 | + (1 << SIGHUP) |
180 | signal(SIGQUIT, sig_handler); | 180 | + (1 << SIGINT) |
181 | signal(SIGTERM, sig_handler); | 181 | + (1 << SIGQUIT) |
182 | + (1 << SIGTERM) | ||
183 | , sig_handler); | ||
182 | } | 184 | } |
183 | 185 | ||
184 | /* Open tty */ | 186 | /* Open tty */ |
diff --git a/networking/telnetd.c b/networking/telnetd.c index 962e5cc7b..0bffa9700 100644 --- a/networking/telnetd.c +++ b/networking/telnetd.c | |||
@@ -279,8 +279,7 @@ make_new_session( | |||
279 | setsid(); | 279 | setsid(); |
280 | 280 | ||
281 | /* Restore default signal handling */ | 281 | /* Restore default signal handling */ |
282 | signal(SIGCHLD, SIG_DFL); | 282 | bb_signals((1 << SIGCHLD) + (1 << SIGPIPE), SIG_DFL); |
283 | signal(SIGPIPE, SIG_DFL); | ||
284 | 283 | ||
285 | /* open the child's side of the tty. */ | 284 | /* open the child's side of the tty. */ |
286 | /* NB: setsid() disconnects from any previous ctty's. Therefore | 285 | /* NB: setsid() disconnects from any previous ctty's. Therefore |
diff --git a/networking/udhcp/signalpipe.c b/networking/udhcp/signalpipe.c index 918abd02d..1486b3b2d 100644 --- a/networking/udhcp/signalpipe.c +++ b/networking/udhcp/signalpipe.c | |||
@@ -42,9 +42,11 @@ void udhcp_sp_setup(void) | |||
42 | close_on_exec_on(signal_pipe.rd); | 42 | close_on_exec_on(signal_pipe.rd); |
43 | close_on_exec_on(signal_pipe.wr); | 43 | close_on_exec_on(signal_pipe.wr); |
44 | ndelay_on(signal_pipe.wr); | 44 | ndelay_on(signal_pipe.wr); |
45 | signal(SIGUSR1, signal_handler); | 45 | bb_signals(0 |
46 | signal(SIGUSR2, signal_handler); | 46 | + (1 << SIGUSR1) |
47 | signal(SIGTERM, signal_handler); | 47 | + (1 << SIGUSR2) |
48 | + (1 << SIGTERM) | ||
49 | , signal_handler); | ||
48 | } | 50 | } |
49 | 51 | ||
50 | 52 | ||