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

cli: append NL to error messages and also print the signal name

Browse source
This commit is contained in:
Jiří Klimeš 2014-06-17 15:20:09 +02:00
parent dbf2d08559
commit c0822f6054
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cli/src/nmcli.c
View file

@ -331,14 +331,16 @@ signal_handling_thread (void *arg) {
} else {
/* We can quit nmcli */
nmc_cleanup_readline ();
printf (_("\nError: nmcli terminated by signal %d."), signo);
printf (_("\nError: nmcli terminated by signal %s (%d)\n"),
strsignal (signo), signo);
exit (1);
}
break;
case SIGQUIT:
case SIGTERM:
nmc_cleanup_readline ();
printf (_("\nError: nmcli terminated by signal %d."), signo);
printf (_("\nError: nmcli terminated by signal %s (%d)\n"),
strsignal (signo), signo);
exit (1);
break;
default:
@ -368,14 +370,14 @@ setup_signals (void)
/* Block all signals of interest. */
status = pthread_sigmask (SIG_BLOCK, &signal_set, NULL);
if (status != 0) {
fprintf (stderr, _("Failed to set signal mask: %d"), status);
fprintf (stderr, _("Failed to set signal mask: %d\n"), status);
return FALSE;
}
/* Create the signal handling thread. */
/* Create the signal handling thread. */
status = pthread_create (&signal_thread_id, NULL, signal_handling_thread, NULL);
if (status != 0) {
fprintf (stderr, _("Failed to create signal handling thread: %d"), status);
fprintf (stderr, _("Failed to create signal handling thread: %d\n"), status);
return FALSE;
}