Simplify signal handling a bit
This commit is contained in:
parent
450e8e6e6b
commit
3468a6e368
10
slstatus.c
10
slstatus.c
|
@ -837,12 +837,10 @@ wifi_essid(const char *iface)
|
|||
}
|
||||
|
||||
static void
|
||||
sighandler(const int signo)
|
||||
terminate(const int signo)
|
||||
{
|
||||
if (signo == SIGTERM || signo == SIGINT) {
|
||||
done = 1;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
usage(void)
|
||||
|
@ -874,9 +872,9 @@ main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
memset(&act, 0, sizeof(act));
|
||||
act.sa_handler = sighandler;
|
||||
sigaction(SIGINT, &act, 0);
|
||||
sigaction(SIGTERM, &act, 0);
|
||||
act.sa_handler = terminate;
|
||||
sigaction(SIGINT, &act, NULL);
|
||||
sigaction(SIGTERM, &act, NULL);
|
||||
|
||||
if (!sflag) {
|
||||
dpy = XOpenDisplay(NULL);
|
||||
|
|
Loading…
Reference in New Issue