diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-09-11 19:51:11 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-09-11 19:51:11 +0000 |
commit | 08ea11ab0749a7977e6d47cd0fa7b3c9cc10af32 (patch) | |
tree | 84049bf86fbcbe95ad0443816efd07f8c02c1288 /miscutils/inotifyd.c | |
parent | 9725daa03a7806b1c9c5a3c511dfe2ff9f97dd26 (diff) | |
download | busybox-w32-08ea11ab0749a7977e6d47cd0fa7b3c9cc10af32.tar.gz busybox-w32-08ea11ab0749a7977e6d47cd0fa7b3c9cc10af32.tar.bz2 busybox-w32-08ea11ab0749a7977e6d47cd0fa7b3c9cc10af32.zip |
runsvd: shrink by Vladimir
*: use unified trivial signal handler
function old new delta
record_signo - 10 +10
process_stdin 433 443 +10
bbunpack 383 391 +8
wc_main 598 605 +7
conescape 293 296 +3
nmeter_main 670 672 +2
fallbackSort 1717 1719 +2
bb_got_signal - 1 +1
microcom_main 713 712 -1
signalled 2 - -2
pack_gzip 1661 1659 -2
evalvar 1376 1374 -2
compare_keys 737 735 -2
parse_command 1460 1456 -4
expand 1748 1744 -4
s_term 37 29 -8
s_hangup 8 - -8
fgotsig 10 - -10
find_pair 187 169 -18
signal_handler 190 170 -20
runsvdir_main 1701 1583 -118
------------------------------------------------------------------------------
(add/remove: 2/3 grow/shrink: 6/10 up/down: 43/-199) Total: -156 bytes
Diffstat (limited to 'miscutils/inotifyd.c')
-rw-r--r-- | miscutils/inotifyd.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/miscutils/inotifyd.c b/miscutils/inotifyd.c index 2a1a15348..3b11dc271 100644 --- a/miscutils/inotifyd.c +++ b/miscutils/inotifyd.c | |||
@@ -30,13 +30,6 @@ | |||
30 | #include "libbb.h" | 30 | #include "libbb.h" |
31 | #include <linux/inotify.h> | 31 | #include <linux/inotify.h> |
32 | 32 | ||
33 | static volatile smallint signalled; | ||
34 | |||
35 | static void signal_handler(int signo) | ||
36 | { | ||
37 | signalled = signo; | ||
38 | } | ||
39 | |||
40 | static const char mask_names[] ALIGN1 = | 33 | static const char mask_names[] ALIGN1 = |
41 | "a" // 0x00000001 File was accessed | 34 | "a" // 0x00000001 File was accessed |
42 | "c" // 0x00000002 File was modified | 35 | "c" // 0x00000002 File was modified |
@@ -104,14 +97,14 @@ int inotifyd_main(int argc UNUSED_PARAM, char **argv) | |||
104 | + (1 << SIGINT) | 97 | + (1 << SIGINT) |
105 | + (1 << SIGTERM) | 98 | + (1 << SIGTERM) |
106 | + (1 << SIGPIPE) | 99 | + (1 << SIGPIPE) |
107 | , signal_handler); | 100 | , record_signo); |
108 | 101 | ||
109 | // do watch | 102 | // do watch |
110 | 103 | ||
111 | // pfd.fd = fd; | 104 | // pfd.fd = fd; |
112 | pfd.events = POLLIN; | 105 | pfd.events = POLLIN; |
113 | 106 | ||
114 | while (!signalled && poll(&pfd, 1, -1) > 0) { | 107 | while (!bb_got_signal && poll(&pfd, 1, -1) > 0) { |
115 | ssize_t len; | 108 | ssize_t len; |
116 | void *buf; | 109 | void *buf; |
117 | struct inotify_event *ie; | 110 | struct inotify_event *ie; |