From 25591c322c9305bd54d3ab80cfaf01ef87640d77 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 16 Feb 2008 22:58:56 +0000 Subject: 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 --- sysklogd/klogd.c | 7 ++++--- sysklogd/syslogd.c | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'sysklogd') diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c index d65b6f9a0..6a675b8b3 100644 --- a/sysklogd/klogd.c +++ b/sysklogd/klogd.c @@ -57,9 +57,10 @@ int klogd_main(int argc, char **argv) openlog("kernel", 0, LOG_KERN); /* Set up sig handlers */ - signal(SIGINT, klogd_signal); - signal(SIGKILL, klogd_signal); - signal(SIGTERM, klogd_signal); + bb_signals(0 + + (1 << SIGINT) + + (1 << SIGTERM) + , klogd_signal); signal(SIGHUP, SIG_IGN); /* "Open the log. Currently a NOP." */ diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 457f38103..c6e057138 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -540,9 +540,11 @@ static void do_syslogd(void) int sock_fd; /* Set up signal handlers */ - signal(SIGINT, quit_signal); - signal(SIGTERM, quit_signal); - signal(SIGQUIT, quit_signal); + bb_signals(0 + + (1 << SIGINT) + + (1 << SIGTERM) + + (1 << SIGQUIT) + , quit_signal); signal(SIGHUP, SIG_IGN); /* signal(SIGCHLD, SIG_IGN); - why? */ #ifdef SYSLOGD_MARK -- cgit v1.2.3