summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2012-03-14 13:34:48 +0100
committerDaniel Friesel <derf@finalrewind.org>2012-03-14 13:34:48 +0100
commit1f4029b244eef2cd956447cae46ab5a194a8916c (patch)
tree5d15f9c2a668e810c1e343cf03c33e9fd0578f8f
parent86a6ae59b3b2b63fd71c4668bfcf33d6fea8448b (diff)
Terminate convert when receiving SIG{INT,TERM,QUIT}
-rw-r--r--src/imlib.c3
-rw-r--r--src/signals.c26
2 files changed, 22 insertions, 7 deletions
diff --git a/src/imlib.c b/src/imlib.c
index d83cc08..090159c 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -59,7 +59,7 @@ int xinerama_screen;
int num_xinerama_screens;
#endif /* HAVE_LIBXINERAMA */
-int childpid;
+int childpid = 0;
static char *feh_http_load_image(char *url);
static char *feh_magick_load_image(char *filename);
@@ -327,6 +327,7 @@ static char *feh_magick_load_image(char *filename)
*/
waitpid(-1, &status, 0);
}
+ childpid = 0;
}
return sfn;
diff --git a/src/signals.c b/src/signals.c
index 91f6bf3..0b18aac 100644
--- a/src/signals.c
+++ b/src/signals.c
@@ -37,7 +37,10 @@ void setup_signal_handlers()
(sigemptyset(&feh_ss) == -1) ||
(sigaddset(&feh_ss, SIGUSR1) == -1) ||
(sigaddset(&feh_ss, SIGUSR2) == -1) ||
- (sigaddset(&feh_ss, SIGALRM) == -1))
+ (sigaddset(&feh_ss, SIGALRM) == -1) ||
+ (sigaddset(&feh_ss, SIGTERM) == -1) ||
+ (sigaddset(&feh_ss, SIGQUIT) == -1) ||
+ (sigaddset(&feh_ss, SIGINT) == -1))
{
weprintf("Failed to set up signal masks");
return;
@@ -50,7 +53,10 @@ void setup_signal_handlers()
if (
(sigaction(SIGUSR1, &feh_sh, NULL) == -1) ||
(sigaction(SIGUSR2, &feh_sh, NULL) == -1) ||
- (sigaction(SIGALRM, &feh_sh, NULL) == -1))
+ (sigaction(SIGALRM, &feh_sh, NULL) == -1) ||
+ (sigaction(SIGTERM, &feh_sh, NULL) == -1) ||
+ (sigaction(SIGQUIT, &feh_sh, NULL) == -1) ||
+ (sigaction(SIGINT, &feh_sh, NULL) == -1))
{
weprintf("Failed to set up signal handler");
return;
@@ -64,11 +70,19 @@ void feh_handle_signal(int signo)
winwidget winwid;
int i;
- if (signo == SIGALRM) {
- killpg(childpid, SIGINT);
- kill(childpid, SIGINT);
- return;
+ switch (signo) {
+ case SIGALRM:
+ if (childpid)
+ killpg(childpid, SIGINT);
+ return;
+ case SIGINT:
+ case SIGTERM:
+ case SIGQUIT:
+ if (childpid)
+ killpg(childpid, SIGINT);
+ exit(128 + signo);
}
+
winwid = winwidget_get_first_window_of_type(WIN_TYPE_SLIDESHOW);
if (winwid) {