From d4fe7099d2fdfb3e1f06979f010c11da90e72501 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Fri, 11 Jun 2010 05:35:47 +0000
Subject: src/action.c: reset signal handlers of child process to prevent
 app_will_exit() called on SIGTERM.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2568 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog    |  6 ++++++
 src/action.c | 25 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f569f2f..e6a69635 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-11
+
+	* src/action.c: reset signal handlers of child process to prevent
+	  app_will_exit() called on SIGTERM.
+	  Added debug output.
+
 2010-06-10
 
 	* src/folderview.[ch]: put vbox on the top of folder view.
diff --git a/src/action.c b/src/action.c
index 894945b2..fa7d1da1 100644
--- a/src/action.c
+++ b/src/action.c
@@ -676,6 +676,8 @@ static gboolean execute_actions(gchar *action, GSList *msg_list,
 		children->list	      = children_list;
 		children->nb	      = g_slist_length(children_list);
 
+		create_io_dialog(children);
+
 		for (cur = children_list; cur; cur = cur->next) {
 			child_info = (ChildInfo *) cur->data;
 			child_info->tag_status = 
@@ -683,8 +685,6 @@ static gboolean execute_actions(gchar *action, GSList *msg_list,
 					      GDK_INPUT_READ,
 					      catch_status, child_info);
 		}
-
-		create_io_dialog(children);
 	}
 
 	return is_ok;
@@ -724,14 +724,25 @@ static ChildInfo *fork_child(gchar *cmd, const gchar *msg_str,
 		}
 	}
 
-	debug_print("Forking child and grandchild.\n");
+	debug_print("Forking child and grandchild in %s mode.\n", sync ? "sync" : "async");
 	debug_print("Executing: /bin/sh -c %s\n", cmd);
 
 	pid = fork();
 	if (pid == 0) { /* Child */
+		struct sigaction sa;
+
 		if (setpgid(0, 0))
 			perror("setpgid");
 
+		/* reset signal handlers */
+		memset(&sa, 0, sizeof(sa));
+		sa.sa_handler = SIG_DFL;
+		sigaction(SIGHUP, &sa, NULL);
+		sigaction(SIGINT, &sa, NULL);
+		sigaction(SIGTERM, &sa, NULL);
+		sigaction(SIGQUIT, &sa, NULL);
+		sigaction(SIGPIPE, &sa, NULL);
+
 #ifdef GDK_WINDOWING_X11
 		close(ConnectionNumber(gdk_display));
 #endif /* GDK_WINDOWING_X11 */
@@ -907,6 +918,7 @@ static gint wait_for_children(Children *children)
 		/* free_children(children); */
 	} else if (!children->output) {
 		gtk_widget_destroy(children->dialog);
+		children->dialog = NULL;
 	}
 
 	return FALSE;
@@ -1175,12 +1187,17 @@ static void catch_status(gpointer data, gint source, GdkInputCondition cond)
 	gchar buf;
 	gint c;
 
+	debug_print("Catching child status (child PID: %d).\n", child_info->pid);
+
 	gdk_threads_enter();
 
 	gdk_input_remove(child_info->tag_status);
 
 	c = read(source, &buf, 1);
-	debug_print("Child (PID: %d) returned %c\n", child_info->pid, buf);
+	if (c == 1)
+		debug_print("Child (PID: %d) returned %c\n", child_info->pid, buf);
+	else
+		debug_print("Could not get child (PID: %d) status\n", child_info->pid);
 
 #ifdef G_OS_UNIX
 	waitpid(child_info->pid, NULL, 0);
-- 
cgit v1.2.3