diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-12 23:19:35 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-12 23:19:35 +0000 |
commit | 8e2cfec1cdf34068f2378aae9fe8f5ec0f821e21 (patch) | |
tree | cf328e6b8bbdc608228da528f661124e364edb85 /miscutils/rx.c | |
parent | 4cf1d08fc2e50f9abda999d468c5e972ff4995c2 (diff) | |
download | busybox-w32-8e2cfec1cdf34068f2378aae9fe8f5ec0f821e21.tar.gz busybox-w32-8e2cfec1cdf34068f2378aae9fe8f5ec0f821e21.tar.bz2 busybox-w32-8e2cfec1cdf34068f2378aae9fe8f5ec0f821e21.zip |
libbb: introduse and use signal_[no_]SA_RESTART_empty_mask and sigaction_set
signal_SA_RESTART_empty_mask - 65 +65
signal_no_SA_RESTART_empty_mask - 54 +54
dd_main 1325 1369 +44
sigaction_set - 19 +19
dname_enc 373 377 +4
UNSPEC_print 64 66 +2
setsignal 296 294 -2
bb_signals_recursive 95 92 -3
bb_askpass 367 361 -6
inetd_main 1810 1797 -13
rx_main 912 883 -29
sigdelset 32 - -32
__sigdelset 32 - -32
__GI_sigdelset 32 - -32
sighup_handler 84 37 -47
arping_main 1844 1797 -47
fsck_main 1869 1807 -62
run_list 1917 1844 -73
vlock_main 492 409 -83
progressmeter 883 798 -85
handle_incoming_and_exit 2737 2651 -86
------------------------------------------------------------------------------
(add/remove: 3/3 grow/shrink: 3/12 up/down: 188/-632) Total: -444 bytes
Diffstat (limited to 'miscutils/rx.c')
-rw-r--r-- | miscutils/rx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/miscutils/rx.c b/miscutils/rx.c index 9a8fcaa20..48867b83c 100644 --- a/miscutils/rx.c +++ b/miscutils/rx.c | |||
@@ -220,7 +220,6 @@ static void sigalrm_handler(int ATTRIBUTE_UNUSED signum) | |||
220 | int rx_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 220 | int rx_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
221 | int rx_main(int argc, char **argv) | 221 | int rx_main(int argc, char **argv) |
222 | { | 222 | { |
223 | struct sigaction act; | ||
224 | struct termios tty, orig_tty; | 223 | struct termios tty, orig_tty; |
225 | int termios_err; | 224 | int termios_err; |
226 | int file_fd; | 225 | int file_fd; |
@@ -243,9 +242,7 @@ int rx_main(int argc, char **argv) | |||
243 | } | 242 | } |
244 | 243 | ||
245 | /* No SA_RESTART: we want ALRM to interrupt read() */ | 244 | /* No SA_RESTART: we want ALRM to interrupt read() */ |
246 | memset(&act, 0, sizeof(act)); | 245 | signal_no_SA_RESTART_empty_mask(SIGALRM, sigalrm_handler); |
247 | act.sa_handler = sigalrm_handler; | ||
248 | sigaction(SIGALRM, &act, NULL); | ||
249 | 246 | ||
250 | n = receive(file_fd); | 247 | n = receive(file_fd); |
251 | 248 | ||