DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uloop: Do not override signal handlers not installed by us

Browse source 
Signed-off-by: Michel Stam <m.stam@fugro.nl>
This commit is contained in:
Michel Stam 2014-10-13 16:14:28 +02:00 committed by John Crispin
parent 213122a083
commit 464e05e33b
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
uloop.c
View file

@ -558,28 +558,37 @@ static void uloop_sigchld(int signo)
do_sigchld = true; do_sigchld = true;
} }
static void uloop_setup_signals(bool add) static void uloop_install_handler(int signum, void (*handler)(int), struct sigaction* old, bool add)
{ {
static struct sigaction old_sigint, old_sigchld;
struct sigaction s; struct sigaction s;
struct sigaction *act;
memset(&s, 0, sizeof(struct sigaction)); act = NULL;
sigaction(signum, NULL, &s);
if (add) { if (add) {
s.sa_handler = uloop_handle_sigint; if (s.sa_handler == SIG_DFL) { /* Do not override existing custom signal handlers */
memcpy(old, &s, sizeof(struct sigaction));
s.sa_handler = handler;
s.sa_flags = 0; s.sa_flags = 0;
} else { act = &s;
s = old_sigint; }
}
else if (s.sa_handler == handler) { /* Do not restore if someone modified our handler */
act = old;
} }
sigaction(SIGINT, &s, &old_sigint); if (act != NULL)
sigaction(signum, act, NULL);
}
if (add) static void uloop_setup_signals(bool add)
s.sa_handler = uloop_sigchld; {
else static struct sigaction old_sigint, old_sigchld, old_sigterm;
s = old_sigchld;
sigaction(SIGCHLD, &s, &old_sigchld); uloop_install_handler(SIGINT, uloop_handle_sigint, &old_sigint, add);
uloop_install_handler(SIGTERM, uloop_handle_sigint, &old_sigterm, add);
uloop_install_handler(SIGCHLD, uloop_sigchld, &old_sigchld, add);
} }
static int uloop_get_next_timeout(struct timeval *tv) static int uloop_get_next_timeout(struct timeval *tv)