aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-02-16 22:58:56 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-02-16 22:58:56 +0000
commit25591c322c9305bd54d3ab80cfaf01ef87640d77 (patch)
tree66ce77758e35f4faa2d5f611d0535365f2cba00a /libbb
parent7fc294cdfe1e7f4a12c44f984a698b0c0f609075 (diff)
downloadbusybox-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 'libbb')
-rw-r--r--libbb/Kbuild1
-rw-r--r--libbb/signals.c80
-rw-r--r--libbb/xfuncs.c42
3 files changed, 81 insertions, 42 deletions
diff --git a/libbb/Kbuild b/libbb/Kbuild
index 2fb1b2420..515368de7 100644
--- a/libbb/Kbuild
+++ b/libbb/Kbuild
@@ -78,6 +78,7 @@ lib-y += safe_strncpy.o
78lib-y += safe_write.o 78lib-y += safe_write.o
79lib-y += setup_environment.o 79lib-y += setup_environment.o
80lib-y += sha1.o 80lib-y += sha1.o
81lib-y += signals.o
81lib-y += simplify_path.o 82lib-y += simplify_path.o
82lib-y += skip_whitespace.o 83lib-y += skip_whitespace.o
83lib-y += speed_table.o 84lib-y += speed_table.o
diff --git a/libbb/signals.c b/libbb/signals.c
new file mode 100644
index 000000000..f7e4908e7
--- /dev/null
+++ b/libbb/signals.c
@@ -0,0 +1,80 @@
1/* vi: set sw=4 ts=4: */
2/*
3 * Utility routines.
4 *
5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * Copyright (C) 2006 Rob Landley
7 * Copyright (C) 2006 Denis Vlasenko
8 *
9 * Licensed under GPL version 2, see file LICENSE in this tarball for details.
10 */
11
12#include "libbb.h"
13
14void bb_signals(int sigs, void (*f)(int))
15{
16 int sig_no = 0;
17 int bit = 1;
18
19 while (sigs) {
20 if (sigs & bit) {
21 sigs &= ~bit;
22 signal(sig_no, f);
23 }
24 sig_no++;
25 bit <<= 1;
26 }
27}
28
29void bb_signals_recursive(int sigs, void (*f)(int))
30{
31 int sig_no = 0;
32 int bit = 1;
33 struct sigaction sa;
34
35 memset(&sa, 0, sizeof(sa));
36 sa.sa_handler = f;
37 /*sa.sa_flags = 0;*/
38 /*sigemptyset(&sa.sa_mask); - hope memset did it*/
39
40 while (sigs) {
41 if (sigs & bit) {
42 sigs &= ~bit;
43 sigaction(sig_no, &sa, NULL);
44 }
45 sig_no++;
46 bit <<= 1;
47 }
48}
49
50void sig_block(int sig)
51{
52 sigset_t ss;
53 sigemptyset(&ss);
54 sigaddset(&ss, sig);
55 sigprocmask(SIG_BLOCK, &ss, NULL);
56}
57
58void sig_unblock(int sig)
59{
60 sigset_t ss;
61 sigemptyset(&ss);
62 sigaddset(&ss, sig);
63 sigprocmask(SIG_UNBLOCK, &ss, NULL);
64}
65
66#if 0
67void sig_blocknone(void)
68{
69 sigset_t ss;
70 sigemptyset(&ss);
71 sigprocmask(SIG_SETMASK, &ss, NULL);
72}
73#endif
74
75void sig_pause(void)
76{
77 sigset_t ss;
78 sigemptyset(&ss);
79 sigsuspend(&ss);
80}
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 445e07717..8dd414d6a 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -234,48 +234,6 @@ void xfflush_stdout(void)
234 } 234 }
235} 235}
236 236
237void sig_block(int sig)
238{
239 sigset_t ss;
240 sigemptyset(&ss);
241 sigaddset(&ss, sig);
242 sigprocmask(SIG_BLOCK, &ss, NULL);
243}
244
245void sig_unblock(int sig)
246{
247 sigset_t ss;
248 sigemptyset(&ss);
249 sigaddset(&ss, sig);
250 sigprocmask(SIG_UNBLOCK, &ss, NULL);
251}
252
253#if 0
254void sig_blocknone(void)
255{
256 sigset_t ss;
257 sigemptyset(&ss);
258 sigprocmask(SIG_SETMASK, &ss, NULL);
259}
260#endif
261
262void sig_catch(int sig, void (*f)(int))
263{
264 struct sigaction sa;
265 sa.sa_handler = f;
266 sa.sa_flags = 0;
267 sigemptyset(&sa.sa_mask);
268 sigaction(sig, &sa, NULL);
269}
270
271void sig_pause(void)
272{
273 sigset_t ss;
274 sigemptyset(&ss);
275 sigsuspend(&ss);
276}
277
278
279void xsetenv(const char *key, const char *value) 237void xsetenv(const char *key, const char *value)
280{ 238{
281 if (setenv(key, value, 1)) 239 if (setenv(key, value, 1))