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 --- miscutils/watchdog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'miscutils/watchdog.c') diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c index e040c64fd..28bd35813 100644 --- a/miscutils/watchdog.c +++ b/miscutils/watchdog.c @@ -47,8 +47,10 @@ int watchdog_main(int argc, char **argv) bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv); } - signal(SIGHUP, watchdog_shutdown); - signal(SIGINT, watchdog_shutdown); + bb_signals(0 + + (1 << SIGHUP) + + (1 << SIGINT) + , watchdog_shutdown); /* Use known fd # - avoid needing global 'int fd' */ xmove_fd(xopen(argv[argc - 1], O_WRONLY), 3); -- cgit v1.2.3