Message ID | 6976a3e4-d484-56cb-5450-f4a72cc6dddc@web.de |
---|---|
State | New |
Headers | show |
Series | ivshmem-server: Terminate also on SIGINT | expand |
On 8/3/19 1:48 PM, Jan Kiszka wrote: > From: Jan Kiszka <jan.kiszka@siemens.com> > > Allows to shutdown a foreground session via ctrl-c. > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > contrib/ivshmem-server/main.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c > index 197c79c57e..8a81cdb04c 100644 > --- a/contrib/ivshmem-server/main.c > +++ b/contrib/ivshmem-server/main.c > @@ -223,7 +223,8 @@ main(int argc, char *argv[]) > sa_quit.sa_handler = ivshmem_server_quit_cb; > sa_quit.sa_flags = 0; > if (sigemptyset(&sa_quit.sa_mask) == -1 || > - sigaction(SIGTERM, &sa_quit, 0) == -1) { > + sigaction(SIGTERM, &sa_quit, 0) == -1 || > + sigaction(SIGINT, &sa_quit, 0) == -1) { > perror("failed to add SIGTERM handler; sigaction"); I guess the error string should not mention SIGTERM specifically anymore: perror("failed to add signal handler; sigaction"); > goto err; > } > -- > 2.16.4 > > Ciao, Claudio
diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c index 197c79c57e..8a81cdb04c 100644 --- a/contrib/ivshmem-server/main.c +++ b/contrib/ivshmem-server/main.c @@ -223,7 +223,8 @@ main(int argc, char *argv[]) sa_quit.sa_handler = ivshmem_server_quit_cb; sa_quit.sa_flags = 0; if (sigemptyset(&sa_quit.sa_mask) == -1 || - sigaction(SIGTERM, &sa_quit, 0) == -1) { + sigaction(SIGTERM, &sa_quit, 0) == -1 || + sigaction(SIGINT, &sa_quit, 0) == -1) { perror("failed to add SIGTERM handler; sigaction"); goto err; }