fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-03 17:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus-launch: clarify signal handler

Browse source 
We only register signal_handler() for the three signals that we want
to handle as "kill dbus-daemon and exit", so there's no point in the
switch. Silence -Wswitch-default by removing it altogether.

The variable name got_fatal_signal and the verbose message are both
misleading, because actually this is a handler for multiple signals,
not just SIGHUP. Rename them to be generic.

Based on part of a patch from Thomas Zimmermann.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98191
This commit is contained in:
Simon McVittie 2017-01-17 20:47:16 +00:00 • committed by Simon McVittie
parent 67c3ad422c
commit 053c48c035
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tools/dbus-launch.c
View file

@ -459,19 +459,12 @@ print_variables (const char *bus_address, pid_t bus_pid, long bus_wid,
}
}
static int got_sighup = FALSE;
static int got_fatal_signal = 0;
static void
signal_handler (int sig)
{
switch (sig)
{
case SIGHUP:
case SIGINT:
case SIGTERM:
got_sighup = TRUE;
break;
}
got_fatal_signal = sig;
}
static void kill_bus_when_session_ends (void) _DBUS_GNUC_NORETURN;
@ -487,7 +480,7 @@ kill_bus_when_session_ends (void)
sigset_t empty_mask;
/* install SIGHUP handler */
got_sighup = FALSE;
got_fatal_signal = 0;
sigemptyset (&empty_mask);
act.sa_handler = signal_handler;
act.sa_mask = empty_mask;
@ -564,9 +557,10 @@ kill_bus_when_session_ends (void)
select (MAX (tty_fd, x_fd) + 1,
&read_set, NULL, &err_set, NULL);
if (got_sighup)
if (got_fatal_signal)
{
verbose ("Got SIGHUP, exiting\n");
verbose ("Got fatal signal %d, killing dbus-daemon\n",
got_fatal_signal);
kill_bus_and_exit (0);
}