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 /coreutils/dd.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 'coreutils/dd.c')
| -rw-r--r-- | coreutils/dd.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c index 961b1fff7..f3330e624 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c | |||
| @@ -121,9 +121,6 @@ int dd_main(int argc, char **argv) | |||
| 121 | off_t count; | 121 | off_t count; |
| 122 | off_t seek, skip; | 122 | off_t seek, skip; |
| 123 | const char *infile, *outfile; | 123 | const char *infile, *outfile; |
| 124 | #if ENABLE_FEATURE_DD_SIGNAL_HANDLING | ||
| 125 | struct sigaction sigact; | ||
| 126 | #endif | ||
| 127 | } Z; | 124 | } Z; |
| 128 | #define flags (Z.flags ) | 125 | #define flags (Z.flags ) |
| 129 | #define oc (Z.oc ) | 126 | #define oc (Z.oc ) |
| @@ -132,17 +129,13 @@ int dd_main(int argc, char **argv) | |||
| 132 | #define skip (Z.skip ) | 129 | #define skip (Z.skip ) |
| 133 | #define infile (Z.infile ) | 130 | #define infile (Z.infile ) |
| 134 | #define outfile (Z.outfile) | 131 | #define outfile (Z.outfile) |
| 135 | #define sigact (Z.sigact ) | ||
| 136 | 132 | ||
| 137 | memset(&Z, 0, sizeof(Z)); | 133 | memset(&Z, 0, sizeof(Z)); |
| 138 | INIT_G(); | 134 | INIT_G(); |
| 139 | //fflush(NULL); - is this needed because of NOEXEC? | 135 | //fflush(NULL); - is this needed because of NOEXEC? |
| 140 | 136 | ||
| 141 | #if ENABLE_FEATURE_DD_SIGNAL_HANDLING | 137 | #if ENABLE_FEATURE_DD_SIGNAL_HANDLING |
| 142 | sigact.sa_handler = dd_output_status; | 138 | signal_SA_RESTART_empty_mask(SIGUSR1, dd_output_status); |
| 143 | sigact.sa_flags = SA_RESTART; | ||
| 144 | /*sigemptyset(&sigact.sa_mask); - memset did it */ | ||
| 145 | sigaction(SIGUSR1, &sigact, NULL); | ||
| 146 | #endif | 139 | #endif |
| 147 | 140 | ||
| 148 | for (n = 1; n < argc; n++) { | 141 | for (n = 1; n < argc; n++) { |