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 /miscutils/microcom.c | |
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 'miscutils/microcom.c')
-rw-r--r-- | miscutils/microcom.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/miscutils/microcom.c b/miscutils/microcom.c index 63b07fd69..b9ed9e401 100644 --- a/miscutils/microcom.c +++ b/miscutils/microcom.c | |||
@@ -99,10 +99,12 @@ int microcom_main(int argc, char **argv) | |||
99 | } | 99 | } |
100 | 100 | ||
101 | // setup signals | 101 | // setup signals |
102 | sig_catch(SIGHUP, signal_handler); | 102 | bb_signals_recursive(0 |
103 | sig_catch(SIGINT, signal_handler); | 103 | + (1 << SIGHUP) |
104 | sig_catch(SIGTERM, signal_handler); | 104 | + (1 << SIGINT) |
105 | sig_catch(SIGPIPE, signal_handler); | 105 | + (1 << SIGTERM) |
106 | + (1 << SIGPIPE) | ||
107 | , signal_handler); | ||
106 | 108 | ||
107 | // error exit code if we fail to open the device | 109 | // error exit code if we fail to open the device |
108 | signalled = 1; | 110 | signalled = 1; |