system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 04:24:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

nmcli: fix signal handling

Browse source 
Hook the signal handlers right before the main loop. Prior to that
the default handlers are good enough and our one crashes (due to
loop being instantialized).

Also, set the return value properly to indicate a termination by a
signal.
This commit is contained in:
Lubomir Rintel 2018-01-23 14:59:29 +01:00
parent 7e8a84ae10
commit edf6f826b5
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
clients/cli/nmcli.c
View file

@ -452,15 +452,16 @@ signal_handler (gpointer user_data)
if (nmc_get_in_readline ()) {
nmcli_sigint = TRUE;
} else {
g_print (_("Error: nmcli terminated by signal %s (%d)\n"),
strsignal (signo),
signo);
nm_cli.return_value = 0x80 + signo;
g_string_printf (nm_cli.return_text, _("Error: nmcli terminated by signal %s (%d)"),
strsignal (signo), signo);
g_main_loop_quit (loop);
}
break;
case SIGTERM:
g_print (_("Error: nmcli terminated by signal %s (%d)\n"),
strsignal (signo), signo);
nm_cli.return_value = 0x80 + signo;
g_string_printf (nm_cli.return_text, _("Error: nmcli terminated by signal %s (%d)"),
strsignal (signo), signo);
nmc_exit ();
break;
}
@ -629,13 +630,14 @@ main (int argc, char *argv[])
/* Save terminal settings */
tcgetattr (STDIN_FILENO, &termios_orig);
g_unix_signal_add (SIGTERM, signal_handler, GINT_TO_POINTER (SIGTERM));
g_unix_signal_add (SIGINT, signal_handler, GINT_TO_POINTER (SIGINT));
nmc_value_transforms_register ();
nmc_init (&nm_cli);
loop = g_main_loop_new (NULL, FALSE);
g_unix_signal_add (SIGTERM, signal_handler, GINT_TO_POINTER (SIGTERM));
g_unix_signal_add (SIGINT, signal_handler, GINT_TO_POINTER (SIGINT));
if (process_command_line (&nm_cli, argc, argv))
g_main_loop_run (loop);