/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Claws Mail Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2015 Hiroyuki Yamamoto & The Claws Mail 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include "action.h"
#include "compose.h"
#include "procmsg.h"
+#include "msgcache.h"
#include "textview.h"
#include "matcher_parser.h" /* CLAWS */
#include "filtering.h"
#include "procheader.h"
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+
typedef struct _Children Children;
typedef struct _ChildInfo ChildInfo;
typedef struct _UserStringDialog UserStringDialog;
{
Children *children;
gchar *cmd;
- pid_t pid;
+ GPid pid;
+ gint next_sig;
gint chld_in;
gint chld_out;
gint chld_err;
- gint chld_status;
gint tag_in;
gint tag_out;
gint tag_err;
GSList *msginfo_list;
};
-static void action_update_menu (GtkItemFactory *ifactory,
+static void action_update_menu (GtkUIManager *ui_manager,
+ const gchar *accel_group,
gchar *branch_path,
gpointer callback,
gpointer data);
-static void compose_actions_execute_cb (Compose *compose,
+static void compose_actions_execute_cb (GtkWidget *widget,
+ gpointer data);
+static void compose_actions_execute (Compose *compose,
guint action_nb,
- GtkWidget *widget);
-static void mainwin_actions_execute_cb (MainWindow *mainwin,
+ GtkWidget *widget);
+
+static void mainwin_actions_execute_cb (GtkWidget *widget,
+ gpointer data);
+static void mainwin_actions_execute (MainWindow *mainwin,
guint action_nb,
GtkWidget *widget);
-static void msgview_actions_execute_cb (MessageView *msgview,
+
+static void msgview_actions_execute_cb (GtkWidget *widget,
+ gpointer data);
+static void msgview_actions_execute (MessageView *msgview,
guint action_nb,
- GtkWidget *widget);
+ GtkWidget *widget);
+
static void message_actions_execute (MessageView *msgview,
guint action_nb,
GSList *msg_list);
static void catch_output (gpointer data,
gint source,
- GdkInputCondition cond);
+ GIOCondition cond);
static void catch_input (gpointer data,
gint source,
- GdkInputCondition cond);
-static void catch_status (gpointer data,
- gint source,
- GdkInputCondition cond);
+ GIOCondition cond);
+static void catch_status (GPid pid, gint status, gpointer data);
static gchar *get_user_string (const gchar *action,
ActionType type);
ActionType action_get_type(const gchar *action_str)
{
const gchar *p;
+ gboolean in_filtering_action = FALSE;
ActionType action_type = ACTION_NONE;
- g_return_val_if_fail(action_str, ACTION_ERROR);
- g_return_val_if_fail(*action_str, ACTION_ERROR);
+ cm_return_val_if_fail(action_str, ACTION_ERROR);
+ cm_return_val_if_fail(*action_str, ACTION_ERROR);
p = action_str;
return ACTION_ERROR;
while (*p && action_type != ACTION_ERROR) {
- if (p[0] == '%' && p[1]) {
- switch (p[1]) {
- case 'a':
- /* CLAWS: filtering action is a mutually exclusive
- * action. we can enable others if needed later. we
- * add ACTION_SINGLE | ACTION_MULTIPLE so it will
- * only be executed from the main window toolbar */
- if (p[2] == 's') /* source messages */
- action_type = ACTION_FILTERING_ACTION
- | ACTION_SINGLE
- | ACTION_MULTIPLE;
- break;
- case 'f':
- action_type |= ACTION_SINGLE;
- break;
- case 'F':
- action_type |= ACTION_MULTIPLE;
- break;
- case 'p':
- action_type |= ACTION_SINGLE;
- break;
- case 's':
- action_type |= ACTION_SELECTION_STR;
- break;
- case 'u':
- action_type |= ACTION_USER_STR;
- break;
- case 'h':
- action_type |= ACTION_USER_HIDDEN_STR;
- break;
- default:
- action_type = ACTION_ERROR;
- break;
+ if (!in_filtering_action) {
+ if (p[0] == '%' && p[1]) {
+ switch (p[1]) {
+ case 'a':
+ /* CLAWS: filtering action is a mutually exclusive
+ * action. we can enable others if needed later. we
+ * add ACTION_SINGLE | ACTION_MULTIPLE so it will
+ * only be executed from the main window toolbar */
+ if (p[2] == 's') /* source messages */
+ action_type = ACTION_FILTERING_ACTION
+ | ACTION_SINGLE
+ | ACTION_MULTIPLE;
+ in_filtering_action = TRUE;
+ break;
+ case 'f':
+ action_type |= ACTION_SINGLE;
+ break;
+ case 'F':
+ action_type |= ACTION_MULTIPLE;
+ break;
+ case 'p':
+ action_type |= ACTION_SINGLE;
+ break;
+ case 's':
+ action_type |= ACTION_SELECTION_STR;
+ break;
+ case 'u':
+ action_type |= ACTION_USER_STR;
+ break;
+ case 'h':
+ action_type |= ACTION_USER_HIDDEN_STR;
+ break;
+ case '%':
+ /* literal '%' */
+ break;
+ default:
+ action_type = ACTION_ERROR;
+ break;
+ }
+ p++;
+ } else if (p[0] == '|') {
+ if (p[1] == '\0')
+ action_type |= ACTION_PIPE_OUT;
+ } else if (p[0] == '>') {
+ if (p[1] == '\0')
+ action_type |= ACTION_INSERT;
+ } else if (p[0] == '&') {
+ if (p[1] == '\0')
+ action_type |= ACTION_ASYNC;
+ } else if (p[0] == '}') {
+ in_filtering_action = FALSE;
}
- } else if (p[0] == '|') {
- if (p[1] == '\0')
- action_type |= ACTION_PIPE_OUT;
- } else if (p[0] == '>') {
- if (p[1] == '\0')
- action_type |= ACTION_INSERT;
- } else if (p[0] == '&') {
- if (p[1] == '\0')
- action_type |= ACTION_ASYNC;
}
- p++;
+ p++;
}
return action_type;
g_string_append(cmd, user_hidden_str);
p++;
break;
+ case '%':
+ g_string_append_c(cmd, p[1]);
+ p++;
+ break;
default:
g_string_append_c(cmd, p[0]);
g_string_append_c(cmd, p[1]);
gchar *p, *q;
gchar escape_ch[] = "\\ ";
- g_return_val_if_fail(msginfo, FALSE);
+ cm_return_val_if_fail(msginfo, FALSE);
filename = procmsg_get_message_file(msginfo);
}
p = filename;
- while ((q = strpbrk(p, "$\"`'\\ \t*?[]&|;<>()!#~")) != NULL) {
+ g_string_append(cmd, "\"");
+#ifdef G_OS_UNIX
+ while ((q = strpbrk(p, "$\"`\\~")) != NULL) {
escape_ch[1] = *q;
*q = '\0';
g_string_append(cmd, p);
g_string_append(cmd, escape_ch);
p = q + 1;
}
- g_string_append(cmd, p);
+ g_string_append(cmd, p);
+#else
+ g_string_append(cmd, filename);
+#endif
+ g_string_append(cmd, "\"");
g_free(filename);
return TRUE;
g_free(filename);
if (ret < 0) {
- alertpanel_error(_("Can't get part of multipart message"));
+ alertpanel_error(_("Can't get part of multipart message: %s"), g_strerror(-ret));
g_free(part_filename);
return FALSE;
}
gint source)
{
if (source == TOOLBAR_MAIN)
- mainwin_actions_execute_cb((MainWindow*)data, action_nb, widget);
+ mainwin_actions_execute((MainWindow*)data, action_nb, widget);
else if (source == TOOLBAR_COMPOSE)
- compose_actions_execute_cb((Compose*)data, action_nb, widget);
+ compose_actions_execute((Compose*)data, action_nb, widget);
else if (source == TOOLBAR_MSGVIEW)
- msgview_actions_execute_cb((MessageView*)data, action_nb, widget);
+ msgview_actions_execute((MessageView*)data, action_nb, widget);
}
-void action_update_mainwin_menu(GtkItemFactory *ifactory,
+void action_update_mainwin_menu(GtkUIManager *ui_manager,
gchar *branch_path,
MainWindow *mainwin)
{
- action_update_menu(ifactory, branch_path,
+ action_update_menu(ui_manager, "<MainwinActions>", branch_path,
mainwin_actions_execute_cb, mainwin);
}
-void action_update_msgview_menu(GtkItemFactory *ifactory,
+void action_update_msgview_menu(GtkUIManager *ui_manager,
gchar *branch_path,
MessageView *msgview)
{
- action_update_menu(ifactory, branch_path,
+ action_update_menu(ui_manager, "<MsgviewActions>", branch_path,
msgview_actions_execute_cb, msgview);
}
-void action_update_compose_menu(GtkItemFactory *ifactory,
+void action_update_compose_menu(GtkUIManager *ui_manager,
gchar *branch_path,
Compose *compose)
{
- action_update_menu(ifactory, branch_path,
+ action_update_menu(ui_manager, "<ComposeActions>", branch_path,
compose_actions_execute_cb, compose);
}
-static void action_update_menu(GtkItemFactory *ifactory,
+static GtkWidget *find_item_in_menu(GtkWidget *menu, gchar *name)
+{
+ GList *children = gtk_container_get_children(GTK_CONTAINER(GTK_MENU_SHELL(menu)));
+ GList *amenu = children;
+ const gchar *existing_name;
+ while (amenu) {
+ GtkWidget *item = GTK_WIDGET(amenu->data);
+ if ((existing_name = g_object_get_data(G_OBJECT(item), "s_name")) != NULL &&
+ !strcmp2(name, existing_name))
+ {
+ g_list_free(children);
+ return item;
+ }
+ amenu = amenu->next;
+ }
+
+ g_list_free(children);
+
+ return NULL;
+}
+
+static GtkWidget *create_submenus(GtkWidget *menu, const gchar *action)
+{
+ gchar *submenu = g_strdup(action);
+ GtkWidget *new_menu = NULL;
+
+ if (strchr(submenu, '/')) {
+ const gchar *end = (strchr(submenu, '/')+1);
+ GtkWidget *menu_item = NULL;
+ if (end && *end) {
+ *strchr(submenu, '/') = '\0';
+ if ((menu_item = find_item_in_menu(menu, submenu)) == NULL) {
+ menu_item = gtk_menu_item_new_with_mnemonic(submenu);
+ g_object_set_data_full(G_OBJECT(menu_item), "s_name", g_strdup(submenu), g_free);
+ gtk_widget_show(menu_item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
+ new_menu = gtk_menu_new();
+ gtk_widget_show(new_menu);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), new_menu);
+ } else {
+ new_menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu_item));
+ }
+ new_menu = create_submenus(new_menu, end);
+ }
+ }
+ g_free(submenu);
+ return new_menu ? new_menu : menu;
+}
+
+static void action_update_menu(GtkUIManager *ui_manager,
+ const gchar *accel_group,
gchar *branch_path,
gpointer callback, gpointer data)
{
- GtkWidget *menuitem;
- gchar *menu_path;
GSList *cur;
gchar *action, *action_p;
- GList *amenu;
- GtkItemFactoryEntry ifentry = {NULL, NULL, NULL, 0, "<Branch>"};
-
- ifentry.path = branch_path;
- menuitem = gtk_item_factory_get_widget(ifactory, branch_path);
- g_return_if_fail(menuitem != NULL);
-
- amenu = GTK_MENU_SHELL(menuitem)->children;
- while (amenu != NULL) {
- GList *alist = amenu->next;
- gtk_widget_destroy(GTK_WIDGET(amenu->data));
- amenu = alist;
- }
+ int callback_action = 0;
+ GtkWidget *menu = gtk_menu_new();
+ GtkWidget *item;
- ifentry.accelerator = NULL;
- ifentry.callback_action = 0;
- ifentry.callback = callback;
- ifentry.item_type = NULL;
-
- for (cur = prefs_common.actions_list; cur; cur = cur->next) {
+ for (cur = prefs_common.actions_list; cur != NULL; cur = cur->next) {
+ GtkWidget *cur_menu = menu;
+ const gchar *action_name = NULL;
action = g_strdup((gchar *)cur->data);
action_p = strstr(action, ": ");
if (action_p && action_p[2] &&
(action_get_type(&action_p[2]) != ACTION_ERROR) &&
(action[0] != '/')) {
+ gchar *accel_path = NULL;
+
action_p[0] = '\0';
- menu_path = g_strdup_printf("%s/%s", branch_path,
- action);
- ifentry.path = menu_path;
- gtk_item_factory_create_item(ifactory, &ifentry, data,
- 1);
- g_free(menu_path);
+ if (strchr(action, '/')) {
+ cur_menu = create_submenus(cur_menu, action);
+ action_name = strrchr(action, '/')+1;
+ } else {
+ action_name = action;
+ }
+ gtk_menu_set_accel_group (GTK_MENU (cur_menu),
+ gtk_ui_manager_get_accel_group(ui_manager));
+ item = gtk_menu_item_new_with_label(action_name);
+ gtk_menu_shell_append(GTK_MENU_SHELL(cur_menu), item);
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(callback), data);
+ g_object_set_data(G_OBJECT(item), "action_num", GINT_TO_POINTER(callback_action));
+ gtk_widget_show(item);
+ accel_path = g_strconcat(accel_group,branch_path, "/", action, NULL);
+ gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
+ g_free(accel_path);
+
}
g_free(action);
- ifentry.callback_action++;
+ callback_action++;
}
+
+ gtk_widget_show(menu);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(gtk_ui_manager_get_widget(ui_manager, branch_path)), menu);
}
-static void compose_actions_execute_cb(Compose *compose, guint action_nb,
- GtkWidget *widget)
+static void compose_actions_execute_cb(GtkWidget *widget, gpointer data)
+{
+ Compose *compose = (Compose *)data;
+ gint action_nb = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "action_num"));
+ compose_actions_execute(compose, action_nb, NULL);
+}
+
+static void compose_actions_execute(Compose *compose, guint action_nb, GtkWidget *widget)
{
gchar *buf, *action;
ActionType action_type;
- g_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
+ cm_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
buf = (gchar *)g_slist_nth_data(prefs_common.actions_list, action_nb);
- g_return_if_fail(buf != NULL);
+ cm_return_if_fail(buf != NULL);
action = strstr(buf, ": ");
- g_return_if_fail(action != NULL);
+ cm_return_if_fail(action != NULL);
/* Point to the beginning of the command-line */
action += 2;
compose_action_cb, compose);
}
-static void mainwin_actions_execute_cb(MainWindow *mainwin, guint action_nb,
+static void mainwin_actions_execute_cb(GtkWidget *widget, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+ gint action_nb = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "action_num"));
+ mainwin_actions_execute(mainwin, action_nb, NULL);
+}
+
+static void mainwin_actions_execute(MainWindow *mainwin, guint action_nb,
GtkWidget *widget)
{
GSList *msg_list;
g_slist_free(msg_list);
}
-static void msgview_actions_execute_cb(MessageView *msgview, guint action_nb,
+static void msgview_actions_execute_cb(GtkWidget *widget, gpointer data)
+{
+ MessageView *msgview = (MessageView *)data;
+ gint action_nb = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "action_num"));
+ msgview_actions_execute(msgview, action_nb, NULL);
+}
+
+static void msgview_actions_execute(MessageView *msgview, guint action_nb,
GtkWidget *widget)
{
GSList *msg_list = NULL;
guint body_pos = 0;
ActionType action_type;
- g_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
+ cm_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
buf = (gchar *)g_slist_nth_data(prefs_common.actions_list, action_nb);
- g_return_if_fail(buf);
- g_return_if_fail((action = strstr(buf, ": ")));
+ cm_return_if_fail(buf);
+ cm_return_if_fail((action = strstr(buf, ": ")));
/* Point to the beginning of the command-line */
action += 2;
action_string = g_strndup(sbegin, send - sbegin);
action_list = matcher_parser_get_action_list(action_string);
+ if (action_list == NULL) {
+ gchar *tmp = g_strdup(action_string);
+
+ g_strstrip(tmp);
+ if (*tmp == '\0')
+ alertpanel_error(_("There is no filtering action set"));
+ else
+ alertpanel_error(_("Invalid filtering action(s):\n%s"), tmp);
+ g_free(action_string);
+ g_free(tmp);
+ return FALSE;
+ }
g_free(action_string);
- if (action_list == NULL) return FALSE;
/* apply actions on each message info */
for (p = msglist; p && p->data; p = g_slist_next(p)) {
filteringaction_apply_action_list(action_list, (MsgInfo *) p->data);
-
}
if (summaryview) {
gint body_pos, MimeInfo *partinfo,
void (*callback)(void *data), void *data)
{
- GSList *children_list = NULL;
+ GSList *children_list = NULL, *cur = NULL;
gint is_ok = TRUE;
gint msg_list_len;
Children *children;
GtkTextIter start_iter, end_iter;
gboolean is_selection = FALSE;
- g_return_val_if_fail(action && *action, FALSE);
+ cm_return_val_if_fail(action && *action, FALSE);
action_type = action_get_type(action);
((action_type & ACTION_SINGLE) == 0 || msg_list_len == 1))
children->open_in = 1;
- if (action_type & ACTION_SINGLE) {
- GSList *cur;
+ /* Pre-fetch bodies, makes it easier on IMAP (see bug #3011) */
+ for (cur = msg_list; cur; cur = cur->next) {
+ gchar *dummy;
+ msginfo = (MsgInfo *)cur->data;
+
+ dummy = procmsg_get_message_file((MsgInfo *)cur->data);
+ if (dummy)
+ g_free(dummy);
+ else
+ is_ok = FALSE;
+ }
+ if (is_ok && (action_type & ACTION_SINGLE)) {
for (cur = msg_list; cur && is_ok == TRUE; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
if (!msginfo) {
}
g_free(cmd);
}
- } else {
+ } else if (is_ok) {
cmd = parse_action_cmd(action, NULL, msg_list, partinfo,
user_str, user_hidden_str, sel_str);
if (cmd) {
child_info->callback = callback;
child_info->data = data;
child_info->tag_status =
- gdk_input_add(child_info->chld_status,
- GDK_INPUT_READ,
- catch_status, child_info);
+ g_child_watch_add(child_info->pid, catch_status, child_info);
}
create_io_dialog(children);
static ChildInfo *fork_child(gchar *cmd, const gchar *msg_str,
Children *children)
{
-#ifdef G_OS_UNIX
- gint chld_in[2], chld_out[2], chld_err[2], chld_status[2];
- gchar *cmdline[4], *ret_str;
- pid_t pid, gch_pid;
+ gint chld_in, chld_out, chld_err;
+ gchar **argv, *ret_str, *trim_cmd;
+ GPid pid;
ChildInfo *child_info;
- gint sync;
+ gint follow_child;
gssize by_written = 0, by_read = 0;
+ gboolean result = FALSE;
+ GError *error = NULL;
- sync = !(children->action_type & ACTION_ASYNC);
-
- chld_in[0] = chld_in[1] = chld_out[0] = chld_out[1] = chld_err[0]
- = chld_err[1] = chld_status[0] = chld_status[1] = -1;
-
- if (sync) {
- if (pipe(chld_status) || pipe(chld_in) || pipe(chld_out) ||
- pipe(chld_err)) {
- alertpanel_error(_("Command could not be started. "
- "Pipe creation failed.\n%s"),
- g_strerror(errno));
- /* Closing fd = -1 fails silently */
- close(chld_in[0]);
- close(chld_in[1]);
- close(chld_out[0]);
- close(chld_out[1]);
- close(chld_err[0]);
- close(chld_err[1]);
- close(chld_status[0]);
- close(chld_status[1]);
- return NULL; /* Pipe error */
- }
- }
-
- debug_print("Forking child and grandchild.\n");
- debug_print("Executing: /bin/sh -c %s\n", cmd);
+ follow_child = !(children->action_type & ACTION_ASYNC);
- pid = fork();
- if (pid == 0) { /* Child */
- if (setpgid(0, 0))
- perror("setpgid");
-
-#ifdef GDK_WINDOWING_X11
- close(ConnectionNumber(gdk_display));
-#endif /* GDK_WINDOWING_X11 */
+ chld_in = chld_out = chld_err = -1;
- gch_pid = fork();
+ ret_str = g_locale_from_utf8(cmd, strlen(cmd),
+ &by_read, &by_written,
+ NULL);
+ if (!ret_str || !by_written)
+ ret_str = g_strdup(cmd);
- if (gch_pid == 0) {
- if (setpgid(0, getppid()))
- perror("setpgid");
+ trim_cmd = ret_str;
- if (sync) {
- if (children->action_type &
- (ACTION_PIPE_IN |
- ACTION_USER_IN |
- ACTION_USER_HIDDEN_IN)) {
- close(fileno(stdin));
- dup (chld_in[0]);
- }
- close(chld_in[0]);
- close(chld_in[1]);
-
- close(fileno(stdout));
- dup (chld_out[1]);
- close(chld_out[0]);
- close(chld_out[1]);
-
- close(fileno(stderr));
- dup (chld_err[1]);
- close(chld_err[0]);
- close(chld_err[1]);
- }
+ while (g_ascii_isspace(trim_cmd[0]))
+ trim_cmd++;
- cmdline[0] = "sh";
- cmdline[1] = "-c";
- ret_str = g_locale_from_utf8(cmd, strlen(cmd),
- &by_read, &by_written,
- NULL);
- if (ret_str && by_written)
- cmdline[2] = ret_str;
- else
- cmdline[2] = cmd;
- cmdline[3] = NULL;
- execvp("/bin/sh", cmdline);
+#ifdef G_OS_UNIX
+ argv = g_new0(gchar *, 4);
+ argv[0] = g_strdup("/bin/sh");
+ argv[1] = g_strdup("-c");
+ argv[2] = g_strdup(trim_cmd);
+ argv[3] = 0;
+#else
+ argv = strsplit_with_quote(trim_cmd, " ", 0);
+#endif
+ g_free(ret_str);
- perror("execvp");
- g_free(ret_str);
- _exit(1);
- } else if (gch_pid < (pid_t) 0) { /* Fork error */
- if (sync)
- write(chld_status[1], "1\n", 2);
- perror("fork");
- _exit(1);
- } else { /* Child */
- if (sync) {
- close(chld_in[0]);
- close(chld_in[1]);
- close(chld_out[0]);
- close(chld_out[1]);
- close(chld_err[0]);
- close(chld_err[1]);
- close(chld_status[0]);
-
- debug_print("Child: Waiting for grandchild\n");
- waitpid(gch_pid, NULL, 0);
- debug_print("Child: grandchild ended\n");
- write(chld_status[1], "0\n", 2);
- close(chld_status[1]);
- }
- _exit(0);
- }
- } else if (pid < 0) { /* Fork error */
- alertpanel_error(_("Could not fork to execute the following "
- "command:\n%s\n%s"),
- cmd, g_strerror(errno));
- return NULL;
+ if (follow_child) {
+ result = g_spawn_async_with_pipes(NULL, argv, NULL,
+ G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
+ NULL, NULL, &pid, &chld_in, &chld_out,
+ &chld_err, &error);
+ } else {
+ result = g_spawn_async(NULL, argv, NULL,
+ G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL,
+ &pid, &error);
}
- /* Parent */
+ debug_print("spawning %s: %d\n", cmd, result);
- if (!sync) {
- waitpid(pid, NULL, 0);
+ g_strfreev(argv);
+
+ if (!result) {
+ alertpanel_error(_("Could not fork to execute the following "
+ "command:\n%s\n%s"),
+ cmd, error ? error->message : _("Unknown error"));
+ if (error)
+ g_error_free(error);
return NULL;
}
- close(chld_in[0]);
if (!(children->action_type &
(ACTION_PIPE_IN | ACTION_USER_IN | ACTION_USER_HIDDEN_IN)))
- close(chld_in[1]);
- close(chld_out[1]);
- close(chld_err[1]);
- close(chld_status[1]);
+ (void)close(chld_in);
+ if (!follow_child) {
+ g_spawn_close_pid(pid);
+ return NULL;
+ }
child_info = g_new0(ChildInfo, 1);
child_info->children = children;
child_info->pid = pid;
+#ifdef G_OS_UNIX
+ child_info->next_sig = SIGTERM;
+#endif
child_info->cmd = g_strdup(cmd);
child_info->new_out = FALSE;
child_info->output = g_string_new(NULL);
child_info->chld_in =
(children->action_type &
(ACTION_PIPE_IN | ACTION_USER_IN | ACTION_USER_HIDDEN_IN))
- ? chld_in [1] : -1;
- child_info->chld_out = chld_out[0];
- child_info->chld_err = chld_err[0];
- child_info->chld_status = chld_status[0];
+ ? chld_in : -1;
+ child_info->chld_out = chld_out;
+ child_info->chld_err = chld_err;
+ child_info->tag_status = -1;
child_info->tag_in = -1;
- child_info->tag_out = gdk_input_add(chld_out[0], GDK_INPUT_READ,
- catch_output, child_info);
- child_info->tag_err = gdk_input_add(chld_err[0], GDK_INPUT_READ,
- catch_output, child_info);
+ child_info->tag_out = claws_input_add(chld_out, G_IO_IN | G_IO_HUP | G_IO_ERR,
+ catch_output, child_info, FALSE);
+ child_info->tag_err = claws_input_add(chld_err, G_IO_IN | G_IO_HUP | G_IO_ERR,
+ catch_output, child_info, FALSE);
if (!(children->action_type &
(ACTION_PIPE_IN | ACTION_PIPE_OUT | ACTION_INSERT)))
return child_info;
if ((children->action_type & ACTION_PIPE_IN) && msg_str) {
+ int r;
ret_str = g_locale_from_utf8(msg_str, strlen(msg_str),
&by_read, &by_written, NULL);
if (ret_str && by_written) {
- write(chld_in[1], ret_str, strlen(ret_str));
+ r = write(chld_in, ret_str, strlen(ret_str));
g_free(ret_str);
} else
- write(chld_in[1], msg_str, strlen(msg_str));
+ r = write(chld_in, msg_str, strlen(msg_str));
if (!(children->action_type &
(ACTION_USER_IN | ACTION_USER_HIDDEN_IN)))
- close(chld_in[1]);
+ r = close(chld_in);
child_info->chld_in = -1; /* No more input */
+ if (r != 0)
+ debug_print("%s(%d)", g_strerror(errno), errno);
}
return child_info;
-#else
- return NULL;
-#endif /* G_OS_UNIX */
}
static void kill_children_cb(GtkWidget *widget, gpointer data)
{
-#ifdef G_OS_UNIX
GSList *cur;
Children *children = (Children *) data;
ChildInfo *child_info;
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)
+#ifdef G_OS_UNIX
+ if (child_info->pid && kill(child_info->pid, child_info->next_sig) < 0)
perror("kill");
+ child_info->next_sig = SIGKILL;
+#else
+ TerminateProcess(child_info->pid, 0);
+#endif
}
-#endif /* G_OS_UNIX */
}
static gint wait_for_children(Children *children)
gboolean new_output;
ChildInfo *child_info;
GSList *cur;
- gint nb = children->nb;
-
- children->nb = 0;
cur = children->list;
new_output = FALSE;
while (cur) {
child_info = (ChildInfo *)cur->data;
- if (child_info->pid)
- children->nb++;
new_output |= child_info->new_out;
cur = cur->next;
}
children->output |= new_output;
- if (new_output || (children->dialog && (nb != children->nb)))
+ if (new_output || (children->dialog && (children->initial_nb != children->nb)))
update_io_dialog(children);
if (children->nb)
Children *children = (Children *) data;
ChildInfo *child_info = (ChildInfo *) children->list->data;
- child_info->tag_in = gdk_input_add(child_info->chld_in,
- GDK_INPUT_WRITE,
- catch_input, children);
- gtk_widget_set_sensitive(children->input_hbox, FALSE);
+ child_info->tag_in = claws_input_add(child_info->chld_in,
+ G_IO_OUT | G_IO_ERR,
+ catch_input, children, FALSE);
}
static gint delete_io_dialog_cb(GtkWidget *w, GdkEvent *e, gpointer data)
static gint io_dialog_key_pressed_cb(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && (event->keyval == GDK_Escape ||
- event->keyval == GDK_Return))
+ if (event && (event->keyval == GDK_KEY_Escape ||
+ event->keyval == GDK_KEY_Return ||
+ event->keyval == GDK_KEY_KP_Enter))
hide_io_dialog_cb(widget, data);
return TRUE;
}
* them if necessary
*/
if (child_info->tag_in > 0)
- gdk_input_remove(child_info->tag_in);
+ g_source_remove(child_info->tag_in);
if (child_info->tag_out > 0)
- gdk_input_remove(child_info->tag_out);
+ g_source_remove(child_info->tag_out);
if (child_info->tag_err > 0)
- gdk_input_remove(child_info->tag_err);
+ g_source_remove(child_info->tag_err);
if (child_info->chld_in >= 0)
- close(child_info->chld_in);
+ (void)close(child_info->chld_in);
if (child_info->chld_out >= 0)
- close(child_info->chld_out);
+ (void)close(child_info->chld_out);
if (child_info->chld_err >= 0)
- close(child_info->chld_err);
-
- close(child_info->chld_status);
+ (void)close(child_info->chld_err);
}
static void free_children(Children *children)
if (children->progress_bar) {
gchar *text;
+#ifdef GENERIC_UMPC
+ /* use a more compact format */
+ const gchar *format = "%s %d/%d";
+#else
+ const gchar *format = "%s %d / %d";
+#endif
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(children->progress_bar),
(children->initial_nb == 0) ? 0 :
(gdouble) (children->initial_nb - children->nb) /
(gdouble) children->initial_nb);
- text = g_strdup_printf("%s %d/%d", _("Completed"),
+ text = g_strdup_printf(format, _("Completed"),
children->initial_nb - children->nb,
children->initial_nb);
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(children->progress_bar), text);
g_free(text);
- }
+ }
if (!children->nb) {
gtk_widget_set_sensitive(children->abort_btn, FALSE);
dialog = gtk_dialog_new();
gtk_container_set_border_width
- (GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
+ (GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), 5);
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
gtk_window_set_title(GTK_WINDOW(dialog), _("Action's input/output"));
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
children);
vbox = gtk_vbox_new(FALSE, 8);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
+ gtk_container_add(GTK_CONTAINER(
+ gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
gtk_widget_show(vbox);
g_signal_connect(G_OBJECT(entry), "activate",
G_CALLBACK(send_input), children);
gtk_box_pack_start(GTK_BOX(input_hbox), entry, TRUE, TRUE, 0);
- if (children->action_type & ACTION_USER_HIDDEN_IN)
+ if (children->action_type & ACTION_USER_HIDDEN_IN) {
gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+ }
gtk_widget_show(entry);
send_button = gtk_button_new_from_stock(GTK_STOCK_EXECUTE);
}
if (children->initial_nb > 1) {
- gchar * text;
+ gchar *text;
+#ifdef GENERIC_UMPC
+ /* use a more compact format */
+ const gchar *format = "%s 0/%d\n";
+#else
+ const gchar *format = "%s 0 / %d\n";
+#endif
progress_bar = gtk_progress_bar_new();
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(progress_bar),
GTK_PROGRESS_LEFT_TO_RIGHT);
- text = g_strdup_printf("%s 0/%d\n", _("Completed"),
+#else
+ gtk_orientable_set_orientation(GTK_ORIENTABLE(progress_bar),
+ GTK_ORIENTATION_HORIZONTAL);
+ gtk_progress_bar_set_inverted(GTK_PROGRESS_BAR(progress_bar),
+ FALSE);
+#endif
+ text = g_strdup_printf(format, _("Completed"),
children->initial_nb);
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress_bar),
text);
if (children->nb)
gtk_widget_set_sensitive(close_button, FALSE);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), hbox);
+ gtk_container_add(GTK_CONTAINER(
+ gtk_dialog_get_action_area(GTK_DIALOG(dialog))), hbox);
children->dialog = dialog;
children->scrolledwin = scrolledwin;
gtk_widget_show(dialog);
}
-static void catch_status(gpointer data, gint source, GdkInputCondition cond)
+static void catch_status(GPid pid, gint status, gpointer data)
{
ChildInfo *child_info = (ChildInfo *)data;
- gchar buf;
- gint c;
-
- gdk_input_remove(child_info->tag_status);
- c = read(source, &buf, 1);
- debug_print("Child returned %c\n", buf);
+ debug_print("Child returned %d\n", status);
-#ifdef G_OS_UNIX
- waitpid(-child_info->pid, NULL, 0);
-#endif
childinfo_close_pipes(child_info);
+ g_spawn_close_pid(child_info->pid);
child_info->pid = 0;
if (child_info->children->action_type & (ACTION_SINGLE | ACTION_MULTIPLE)
GSList *cur;
MsgInfo *msginfo, *nmi; /* newmsginfo */
char *file;
-
+ gboolean modified_something = FALSE;
+ FolderItem *last_item = NULL;
if (mainwindow_get_mainwindow ())
summaryview = mainwindow_get_mainwindow ()->summaryview;
for (cur = child_info->msginfo_list; cur; cur = cur->next) {
file = procmsg_get_message_file_path (msginfo);
if (!file)
continue;
- nmi = procheader_parse_file (file, msginfo->flags, FALSE, FALSE);
+ nmi = procheader_parse_file (file, msginfo->flags, TRUE, FALSE);
if (!nmi)
continue; /* Deleted? */
if (msginfo->mtime != nmi->mtime || msginfo->size != nmi->size) {
- msginfo->mtime = nmi->mtime;
- msginfo->size = nmi->size;
- msgcache_update_msg (msginfo->folder->cache, msginfo);
- }
- procmsg_msginfo_free (nmi);
-
- /* refresh the message display, but only if this message is still
- * in focus */
- if (summaryview
- && summaryview->displayed
- && summaryview->folder_item == msginfo->folder
- && summary_get_msgnum (summaryview, summaryview->displayed) == msginfo->msgnum) {
- summary_show (summaryview, summaryview->folder_item);
- summary_select_node (summaryview, summaryview->displayed, TRUE, TRUE);
+ nmi->folder = msginfo->folder;
+ nmi->msgnum = msginfo->msgnum;
+ msgcache_update_msg (msginfo->folder->cache, nmi);
+ modified_something = TRUE;
+ last_item = nmi->folder;
}
+ procmsg_msginfo_free (&nmi);
+ if (summaryview && summaryview->displayed &&
+ summaryview->folder_item == msginfo->folder &&
+ summary_get_msgnum(summaryview, summaryview->displayed) == msginfo->msgnum)
+ summary_redisplay_msg(summaryview);
+
+ }
+ if (modified_something && last_item &&
+ summaryview && summaryview->folder_item == last_item) {
+ summary_show (summaryview, summaryview->folder_item);
}
g_slist_free (child_info->msginfo_list);
child_info->msginfo_list = NULL;
}
+ if (!child_info->pid)
+ child_info->children->nb--;
+
wait_for_children(child_info->children);
}
-static void catch_input(gpointer data, gint source, GdkInputCondition cond)
+static void catch_input(gpointer data, gint source, GIOCondition cond)
{
Children *children = (Children *)data;
ChildInfo *child_info = (ChildInfo *)children->list->data;
gchar *input, *ret_str;
- gint c, count, len;
+ gint c, count, len, r;
gssize by_read = 0, by_written = 0;
debug_print("Sending input to grand child.\n");
- if (!(cond && GDK_INPUT_WRITE))
+ if (!(cond & (G_IO_OUT | G_IO_ERR)))
return;
- gdk_input_remove(child_info->tag_in);
+ gtk_widget_set_sensitive(children->input_hbox, FALSE);
+ gtk_widget_grab_focus(children->abort_btn);
+
+ g_source_remove(child_info->tag_in);
child_info->tag_in = -1;
input = gtk_editable_get_chars(GTK_EDITABLE(children->input_entry),
} while (c >= 0 && count < len);
if (c >= 0)
- write(child_info->chld_in, "\n", 2);
+ r = write(child_info->chld_in, "\n", 2);
g_free(input);
- gtk_entry_set_text(GTK_ENTRY(children->input_entry), "");
- gtk_widget_set_sensitive(children->input_hbox, TRUE);
- close(child_info->chld_in);
+ r = close(child_info->chld_in);
+ child_info->chld_in = -1;
+ if (r != 0)
+ debug_print("%s(%d)", g_strerror(errno), errno);
child_info->chld_in = -1;
debug_print("Input to grand child sent.\n");
}
-static void catch_output(gpointer data, gint source, GdkInputCondition cond)
+static void catch_output(gpointer data, gint source, GIOCondition cond)
{
ChildInfo *child_info = (ChildInfo *)data;
gint c;
break;
ret_str = g_locale_to_utf8
- (buf, c, &bytes_read, &bytes_written, NULL);
+ (buf, c - 1, &bytes_read, &bytes_written, NULL);
if (ret_str && bytes_written > 0) {
gtk_text_buffer_insert
(textbuf, &iter, ret_str,
-1);
g_free(ret_str);
} else
- gtk_text_buffer_insert(textbuf, &iter, buf, c);
+ gtk_text_buffer_insert(textbuf, &iter, buf, c - 1);
}
if (child_info->children->is_selection) {
}
if (c == 0) {
if (source == child_info->chld_out) {
- gdk_input_remove(child_info->tag_out);
+ g_source_remove(child_info->tag_out);
child_info->tag_out = -1;
- close(child_info->chld_out);
+ (void)close(child_info->chld_out);
child_info->chld_out = -1;
} else {
- gdk_input_remove(child_info->tag_err);
+ g_source_remove(child_info->tag_err);
child_info->tag_err = -1;
- close(child_info->chld_err);
+ (void)close(child_info->chld_err);
child_info->chld_err = -1;
}
}
projects / claws.git / blobdiff