diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2006-09-06 01:45:54 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2006-09-06 01:45:54 +0000 |
| commit | d4c112e8df73070a3c1e4e3e7d4a6a6cacc879e4 (patch) | |
| tree | addd53710d770c4564e4dd78eb939b6da33f7724 /src/action.c | |
| parent | 27d538b9eebf2143b582a5514a4e8d5a370bd514 (diff) | |
fixed action.c.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1140 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src/action.c')
| -rw-r--r-- | src/action.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/action.c b/src/action.c index d4f22aa1..5cf0374d 100644 --- a/src/action.c +++ b/src/action.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2005 Hiroyuki Yamamoto & The Sylpheed Claws Team + * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -863,8 +863,8 @@ static void kill_children_cb(GtkWidget *widget, gpointer data) for (cur = children->list; cur; cur = cur->next) { child_info = (ChildInfo *)(cur->data); - debug_print("Killing child group id %d\n", child_info->pid); - if (child_info->pid && kill(-child_info->pid, SIGTERM) < 0) + debug_print("Killing child: %d\n", child_info->pid); + if (child_info->pid && kill(child_info->pid, SIGTERM) < 0) perror("kill"); } #endif /* G_OS_UNIX */ @@ -979,6 +979,14 @@ static void free_children(Children *children) g_free(children->action); while (children->list != NULL) { child_info = (ChildInfo *)children->list->data; +#ifdef G_OS_UNIX + if (child_info->pid != 0) { + if (waitpid(child_info->pid, NULL, 0) + != child_info->pid) { + perror("waitpid (free_children)"); + } + } +#endif g_free(child_info->cmd); g_string_free(child_info->output, TRUE); children->list = g_slist_remove(children->list, child_info); @@ -1166,7 +1174,7 @@ static void catch_status(gpointer data, gint source, GdkInputCondition cond) debug_print("Child returned %c\n", buf); #ifdef G_OS_UNIX - waitpid(-child_info->pid, NULL, 0); + waitpid(child_info->pid, NULL, 0); #endif childinfo_close_pipes(child_info); child_info->pid = 0; |