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 /loginutils | |
| 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 'loginutils')
| -rw-r--r-- | loginutils/vlock.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/loginutils/vlock.c b/loginutils/vlock.c index 846733ea8..ff60d78ff 100644 --- a/loginutils/vlock.c +++ b/loginutils/vlock.c | |||
| @@ -34,7 +34,6 @@ static void acquire_vt(int signo) | |||
| 34 | int vlock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 34 | int vlock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
| 35 | int vlock_main(int argc, char **argv) | 35 | int vlock_main(int argc, char **argv) |
| 36 | { | 36 | { |
| 37 | struct sigaction sa; | ||
| 38 | struct vt_mode vtm; | 37 | struct vt_mode vtm; |
| 39 | struct termios term; | 38 | struct termios term; |
| 40 | struct termios oterm; | 39 | struct termios oterm; |
| @@ -63,17 +62,11 @@ int vlock_main(int argc, char **argv) | |||
| 63 | 62 | ||
| 64 | /* We will use SIGUSRx for console switch control: */ | 63 | /* We will use SIGUSRx for console switch control: */ |
| 65 | /* 1: set handlers */ | 64 | /* 1: set handlers */ |
| 66 | sigemptyset(&sa.sa_mask); | 65 | signal_SA_RESTART_empty_mask(SIGUSR1, release_vt); |
| 67 | sa.sa_flags = SA_RESTART; | 66 | signal_SA_RESTART_empty_mask(SIGUSR2, acquire_vt); |
| 68 | sa.sa_handler = release_vt; | ||
| 69 | sigaction(SIGUSR1, &sa, NULL); | ||
| 70 | sa.sa_handler = acquire_vt; | ||
| 71 | sigaction(SIGUSR2, &sa, NULL); | ||
| 72 | /* 2: unmask them */ | 67 | /* 2: unmask them */ |
| 73 | sigprocmask(SIG_SETMASK, NULL, &sa.sa_mask); | 68 | sig_unblock(SIGUSR1); |
| 74 | sigdelset(&sa.sa_mask, SIGUSR1); | 69 | sig_unblock(SIGUSR2); |
| 75 | sigdelset(&sa.sa_mask, SIGUSR2); | ||
| 76 | sigprocmask(SIG_SETMASK, &sa.sa_mask, NULL); | ||
| 77 | 70 | ||
| 78 | /* Revert stdin/out to our controlling tty | 71 | /* Revert stdin/out to our controlling tty |
| 79 | * (or die if we have none) */ | 72 | * (or die if we have none) */ |