#include <errno.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <signal.h>
+#include <unistd.h>
#include "intl.h"
#include "prefs.h"
#include "compose.h"
#include "procmsg.h"
#include "gtkstext.h"
+#include "mimeview.h"
+#define WAIT_LAP 10000
typedef enum {
ACTION_NONE = 1 << 0,
GtkWidget *input_entry;
GtkWidget *input_hbox;
GtkWidget *abort_btn;
+ GtkWidget *hide_btn;
GtkWidget *scrolledwin;
gchar *action;
- gint timer;
+ guint timer;
GSList *list;
gint nb;
gint open_in;
typedef struct _ChildInfo ChildInfo;
struct _ChildInfo {
+ Children *children;
gchar *cmd;
guint type;
pid_t pid;
gint chld_in;
gint chld_out;
gint chld_err;
+ gint chld_status;
gint tag_in;
gint tag_out;
gint tag_err;
+ gint tag_status;
gint new_out;
GString *output;
GtkWidget *text;
GtkWidget *widget);
static guint get_action_type (gchar *action);
-static gboolean execute_actions (gchar *action,
+static gboolean execute_actions (gchar *action,
GtkWidget *window,
- GtkCTree *ctree,
- GtkWidget *text);
-
-static gchar *parse_action_cmd (gchar *action,
- MsgInfo *msginfo,
- GtkCTree *ctree);
+ GtkCTree *ctree,
+ GtkWidget *text,
+ MimeView *mimeview);
+
+static gchar *parse_action_cmd (gchar *action,
+ MsgInfo *msginfo,
+ GtkCTree *ctree,
+ MimeView *mimeview);
static GString *parse_append_filename (GString *cmd,
MsgInfo *msginfo);
-ChildInfo *fork_child (gchar *cmd,
- gint action_type,
- GtkWidget *text);
+static GString *parse_append_msgpart (GString *cmd,
+ MsgInfo *msginfo,
+ MimeView *mimeview);
+
+ChildInfo *fork_child (gchar *cmd,
+ gint action_type,
+ GtkWidget *text,
+ Children *children);
static gint wait_for_children (gpointer data);
static void catch_input (gpointer data,
gint source,
GdkInputCondition cond);
+static void catch_status (gpointer data,
+ gint source,
+ GdkInputCondition cond);
void prefs_actions_open(MainWindow *mainwin)
{
gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
gtk_window_set_modal (GTK_WINDOW (window), TRUE);
gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, TRUE);
-
+
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
gtk_container_add (GTK_CONTAINER (window), vbox);
GTK_SIGNAL_FUNC(prefs_actions_deleted), NULL);
gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
GTK_SIGNAL_FUNC(prefs_actions_key_pressed), NULL);
- gtk_signal_connect (GTK_OBJECT(window), "focus_in_event",
- GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
- gtk_signal_connect (GTK_OBJECT(window), "focus_out_event",
- GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+ MANAGE_WINDOW_SIGNALS_CONNECT (window);
gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
GTK_SIGNAL_FUNC(prefs_actions_ok), mainwin);
gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
gtk_box_pack_start (GTK_BOX (vbox1), help_vbox, TRUE, TRUE, 0);
help_label = gtk_label_new (_("Menu name:\n"
- " Use '/' in menu name to make submenus.\n"
+ " Use / in menu name to make submenus.\n"
"Command line:\n"
- " Begin with:\n '|' to send message "
+ " Begin with:\n | to send message "
"body or selection "
- "to command\n '>' to send user provided"
- " text to command\n '*' to send user "
+ "to command\n > to send user provided"
+ " text to command\n * to send user "
"provided hidden text to command\n"
- " End with:\n '|' to replace "
+ " End with:\n | to replace "
"message body or selection with command "
- "output\n '&' to "
- "run command asynchronously\n Use '%f' "
- "for message file name\n and '%F' for the"
+ "output\n & to "
+ "run command asynchronously\n Use %f "
+ "for message file name\n %F for the"
" list of the file names of selected "
- "messages."));
+ "messages\n %p for the selected message "
+ "part."));
gtk_misc_set_alignment(GTK_MISC(help_label), 0, 0.5);
gtk_label_set_justify (GTK_LABEL(help_label), GTK_JUSTIFY_LEFT);
gtk_widget_show (help_label);
debug_print(_("Reading actions configurations...\n"));
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACTIONS_RC, NULL);
- if ((fp = fopen(rcpath, "r")) == NULL) {
+ if ((fp = fopen(rcpath, "rb")) == NULL) {
if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
g_free(rcpath);
return;
break;
case 'F': action_type |= ACTION_MULTIPLE;
break;
+ case 'p': action_type |= ACTION_SINGLE;
+ break;
default: action_type = ACTION_ERROR;
break;
}
static gchar *parse_action_cmd (gchar *action,
MsgInfo *msginfo,
- GtkCTree *ctree)
+ GtkCTree *ctree,
+ MimeView *mimeview)
{
- GString *cmd;
+ GString *cmd, *tmpcmd;
gchar *p;
GList *cur;
MsgInfo *msg;
msg = gtk_ctree_node_get_row_data(ctree,
GTK_CTREE_NODE(cur->data));
cmd = parse_append_filename(cmd, msg);
- cmd = g_string_append_c(cmd, ' ');
+ if (cur->next)
+ cmd = g_string_append_c(cmd, ' ');
}
+ p++;
+ break;
+ case 'p':
+ tmpcmd = parse_append_msgpart(cmd,
+ msginfo,
+ mimeview);
+ if (tmpcmd)
+ cmd = tmpcmd;
+ else {
+ g_string_free(cmd, TRUE);
+ return NULL;
+ }
+
p++;
break;
default: cmd = g_string_append_c(cmd, p[0]);
filename = procmsg_get_message_file(msginfo);
- cmd = g_string_append(cmd, filename);
+ if (filename) {
+ cmd = g_string_append(cmd, filename);
+ g_free(filename);
+ }
- g_free(filename);
+ return cmd;
+}
+static GString *parse_append_msgpart(GString *cmd, MsgInfo *msginfo,
+ MimeView *mimeview)
+{
+ gchar *filename;
+ gchar *partname;
+ MimeInfo *partinfo;
+ gint ret;
+ FILE *fp;
+
+ if (!mimeview) {
+#if USE_GPGME
+ if ((fp = procmsg_open_message_decrypted(msginfo, &partinfo))
+ == NULL) {
+ alertpanel_error(_("Could not get message file."));
+ return NULL;
+ }
+#else
+ if ((fp = procmsg_open_message(msginfo)) == NULL)
+ {
+ alertpanel_error(_("Could not get message file."));
+ return NULL;
+ }
+ partinfo = procmime_scan_mime_header(fp);
+#endif
+ fclose(fp);
+ if (!partinfo) {
+ procmime_mimeinfo_free(partinfo);
+ alertpanel_error(_("Could not get message part."));
+ return NULL;
+ }
+ filename = procmsg_get_message_file(msginfo);
+ } else {
+ if (!mimeview->opened) {
+ alertpanel_error(_("No message part selected."));
+ return NULL;
+ }
+ if (!mimeview->file) {
+ alertpanel_error(_("No message file selected."));
+ return NULL;
+ }
+ partinfo = gtk_ctree_node_get_row_data
+ (GTK_CTREE(mimeview->ctree),
+ mimeview->opened);
+ g_return_val_if_fail(partinfo != NULL, cmd);
+ filename = mimeview->file;
+ }
+ partname = procmime_get_tmp_file_name(partinfo);
+
+ ret = procmime_get_part(partname, filename, partinfo);
+
+ if (!mimeview) {
+ procmime_mimeinfo_free(partinfo);
+ g_free(filename);
+ }
+
+ if (ret < 0) {
+ alertpanel_error(_("Can't get part of multipart message"));
+ g_free(partname);
+ return NULL;
+ }
+
+ cmd = g_string_append(cmd,partname);
+
+ g_free(partname);
+
return cmd;
+
}
static void prefs_actions_set_dialog (void)
void update_mainwin_actions_menu(GtkItemFactory *ifactory,
MainWindow *mainwin)
{
- update_actions_menu(ifactory, "/Edit/Actions",
+ update_actions_menu(ifactory, "/Tools/Actions",
mainwin_actions_execute_cb,
mainwin);
}
GtkWidget *menu;
GtkItemFactoryEntry ifentry = {
- branch_path, NULL, NULL, 0, "<Branch>"};
+ NULL, NULL, NULL, 0, "<Branch>"};
+ ifentry.path = branch_path;
menuitem = gtk_item_factory_get_item(ifactory, branch_path);
+ g_return_if_fail(menuitem);
/* FIXME: is there a better way to remove unknown submenu items? */
/* Deleting and recreating the parent looses the translation */
menu = GTK_WIDGET(GTK_MENU_ITEM(menuitem)->submenu);
return;
}
- execute_actions(action, compose->window, NULL, compose->text);
+ execute_actions(action, compose->window, NULL, compose->text, NULL);
}
static void mainwin_actions_execute_cb (MainWindow *mainwin,
GtkWidget *text = NULL;
gchar *buf,
*action;
-
+ MimeView *mimeview = NULL;
+
g_return_if_fail (action_nb < g_slist_length(prefs_common.actionslst));
buf = (gchar *) g_slist_nth_data(prefs_common.actionslst, action_nb);
if (messageview->mimeview &&
messageview->mimeview->type == MIMEVIEW_TEXT &&
messageview->mimeview->textview &&
- messageview->mimeview->textview->text)
+ messageview->mimeview->textview->text) {
text = messageview->mimeview->textview->text;
+ mimeview = messageview->mimeview;
+ }
break;
}
execute_actions(action, mainwin->window,
- GTK_CTREE(mainwin->summaryview->ctree), text);
+ GTK_CTREE(mainwin->summaryview->ctree), text, mimeview);
}
-static gboolean execute_actions(gchar *action,
+static gboolean execute_actions(gchar *action,
GtkWidget *window,
- GtkCTree *ctree,
- GtkWidget *text)
+ GtkCTree *ctree,
+ GtkWidget *text,
+ MimeView *mimeview)
{
GList *cur, *selection;
GSList *children_list = NULL;
is_ok = FALSE; /* ERR: msginfo missing */
break;
}
- cmd = parse_action_cmd(action, msginfo, ctree);
+ cmd = parse_action_cmd(action, msginfo, ctree,
+ mimeview);
if (!cmd) {
- is_ok = FALSE; /* ERR: command incorrect */
+ debug_print(_("Action command error\n"));
+ is_ok = FALSE; /* ERR: incorrect command */
break;
}
- if ((child_info = fork_child(cmd, action_type, text))) {
+ if ((child_info = fork_child(cmd, action_type, text,
+ children))) {
children_list = g_slist_append(children_list,
child_info);
children->open_in = (selection_len == 1) ?
g_free(cmd);
}
} else {
- cmd = parse_action_cmd(action, NULL, ctree);
+ cmd = parse_action_cmd(action, NULL, ctree, mimeview);
if (cmd) {
- if ((child_info = fork_child(cmd, action_type, text))) {
+ if ((child_info = fork_child(cmd, action_type, text,
+ children))) {
children_list = g_slist_append(children_list,
child_info);
children->open_in = action_type &
}
g_free(cmd);
} else
- is_ok = FALSE; /* ERR: command incorrect */
+ is_ok = FALSE; /* ERR: incorrect command */
}
if (!children_list) {
gtk_widget_set_sensitive(window, TRUE);
}
} else {
+ GSList *cur;
+
children->action = g_strdup(action);
children->window = window;
- children->timer = 10;
children->dialog = NULL;
children->list = children_list;
children->nb = g_slist_length(children_list);
- gtk_timeout_add(1000, wait_for_children, children);
+ for (cur = children_list; cur; cur = cur->next) {
+ child_info = (ChildInfo *) cur->data;
+ child_info->tag_status =
+ gdk_input_add(child_info->chld_status,
+ GDK_INPUT_READ,
+ catch_status, child_info);
+ }
+ children->timer = children->open_in ? 0 :
+ gtk_timeout_add(WAIT_LAP, wait_for_children,
+ children);
}
+ if (children->open_in)
+ create_io_dialog(children);
+
return is_ok ;
}
ChildInfo *fork_child(gchar *cmd,
gint action_type,
- GtkWidget *text)
+ GtkWidget *text,
+ Children *children)
{
- gint chld_in[2], chld_out[2], chld_err[2];
+ gint chld_in[2], chld_out[2], chld_err[2], chld_status[2];
gchar **cmdline;
gint start, end, is_selection;
gchar *selection;
- pid_t pid;
+ pid_t pid_c, pid_gc;
ChildInfo *child_info;
if (action_type & ACTION_ASYNC) {
return NULL; /* Asynchronous command */
}
- if (pipe(chld_in) || pipe(chld_out) || pipe(chld_err)) {
+ if (pipe(chld_in) || pipe(chld_out) || pipe(chld_err) ||
+ pipe(chld_status)) {
alertpanel_error(_("Command could not started. Pipe creation"
" failed.\n%s"), g_strerror(errno));
return NULL; /* Pipe error */
}
+
+ debug_print(_("Forking child and grandchild.\n"));
- pid = fork();
- if (pid == (pid_t) 0) {/* Child */
+ pid_c = fork();
+ if (pid_c == (pid_t) 0) {/* Child */
if (setpgid(0, 0))
perror("setpgid");
-
- if (action_type &
- (ACTION_PIPE_IN | ACTION_OPEN_IN | ACTION_HIDE_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]);
close(ConnectionNumber(gdk_display));
- cmdline = strsplit_with_quote(cmd, " ", 1024);
+ pid_gc = fork();
- execvp(cmdline[0], cmdline);
- g_strfreev(cmdline);
+ if (pid_gc == 0) {
+ if (setpgid(0, getppid()))
+ perror("setpgid");
+ if (action_type &
+ (ACTION_PIPE_IN | ACTION_OPEN_IN | ACTION_HIDE_IN)) {
+ close(fileno(stdin));
+ dup (chld_in[0]);
+ }
+ close(chld_in[0]);
+ close(chld_in[1]);
- _exit(1);
- } else if (pid < (pid_t) 0) {/* Fork error */
+ 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]);
+
+ cmdline = strsplit_with_quote(cmd, " ", 1024);
+
+ execvp(cmdline[0], cmdline);
+ perror("execvp");
+ g_strfreev(cmdline);
+
+ _exit(1);
+ } else if (pid_gc < (pid_t) 0) {/* Fork erro */
+ write(chld_status[1], "1\n", 2);
+ perror("fork");
+ _exit(1);
+ } else {/* Child */
+ 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(pid_gc, NULL, 0);
+ debug_print(_("Child: grandchild ended\n"));
+ write(chld_status[1], "0\n", 2);
+ close(chld_status[1]);
+ _exit(0);
+ }
+ } else if (pid_c < (pid_t) 0) {/* Fork error */
alertpanel_error(_("Could not fork to execute the following "
"command:\n%s\n%s"),
cmd, g_strerror(errno));
close(chld_in[1]);
close(chld_out[1]);
close(chld_err[1]);
+ close(chld_status[1]);
child_info = g_new0(ChildInfo, 1);
+
+ child_info->children = children;
- child_info->pid = pid;
+ child_info->pid = pid_c;
child_info->cmd = g_strdup(cmd);
child_info->type = action_type;
child_info->new_out = FALSE;
? 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];
child_info->tag_in = -1;
child_info->tag_out = gdk_input_add(chld_out[0], GDK_INPUT_READ,
catch_output, child_info);
for (cur = children->list; cur; cur = cur->next) {
child_info = (ChildInfo *)(cur->data);
- if (child_info->pid)
- kill(child_info->pid, SIGTERM);
+ debug_print(_("Killing child group id %d\n"), child_info->pid);
+ if (child_info->pid && (kill(-child_info->pid, SIGTERM) < 0))
+ perror("kill");
}
}
Children *children = (Children *) data;
ChildInfo *child_info;
GSList *cur;
- gint nb = 0;
- pid_t pid, wpid;
+ gint nb = children->nb;
+ children->nb = 0;
cur = children->list;
new_output = FALSE;
while (cur) {
child_info = (ChildInfo *) cur->data;
- pid = child_info->pid;
- if (pid) {
- wpid = waitpid(pid, NULL, WNOHANG);
- if (wpid == pid) {
- childinfo_close_pipes(child_info);
- child_info->pid = 0;
- children->nb--;
- nb++;
- }
- }
+ if (child_info->pid)
+ children->nb++;
new_output |= child_info->new_out;
cur = cur->next;
}
- if (children->timer)
- children->timer--;
-
- if (!children->dialog && (new_output || children->timer == 0 || children->open_in))
+ if (!children->dialog &&
+ (new_output || children->timer))
create_io_dialog(children);
-
+
+ if (children->timer) {
+ gtk_timeout_remove(children->timer);
+ children->timer = 0;
+ }
children->output |= new_output;
- if (new_output || (children->dialog && nb))
+ if (new_output || (children->dialog && (nb != children->nb)))
update_io_dialog(children);
if (children->nb)
- return TRUE;
+ return FALSE;
if (!children->dialog) {
gtk_widget_set_sensitive(children->window, TRUE);
Children *children = (Children *) data;
- if (children->nb)
- gtk_widget_hide(children->dialog);
- else {
+ if (!children->nb) {
gtk_widget_set_sensitive(children->window, TRUE);
gtk_signal_disconnect_by_data(GTK_OBJECT(children->dialog),
children);
close(child_info->chld_in);
close(child_info->chld_out);
close(child_info->chld_err);
+ close(child_info->chld_status);
}
static void free_children(Children *children)
GSList *cur;
ChildInfo *child_info;
+ debug_print(_("Freeing children data %x\n"), (guint) children);
+
g_free(children->action);
for (cur = children->list; cur;) {
child_info = (ChildInfo *) cur->data;
g_free(child_info);
cur = children->list;
}
+ g_free(children);
}
static void update_io_dialog(Children *children)
{
GSList *cur;
+ debug_print(_("Updating actions input/output dialog.\n"));
+
if (!children->nb) {
gtk_widget_set_sensitive(children->abort_btn, FALSE);
+ gtk_widget_set_sensitive(children->hide_btn, TRUE);
+ gtk_widget_set_sensitive(children->window, TRUE);
if (children->input_hbox)
gtk_widget_set_sensitive(children->input_hbox, FALSE);
-
}
if (children->output) {
GtkWidget *abort_button;
GtkWidget *hide_button;
+ debug_print(_("Creating actions dialog\n"));
+
dialog = gtk_dialog_new();
label = gtk_label_new(children->action);
gtk_misc_set_padding(GTK_MISC(label), 8, 8);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
input_hbox, FALSE, FALSE, 8);
+ gtk_widget_grab_focus(entry);
}
hbox = gtk_hbox_new(TRUE, 0);
GTK_SIGNAL_FUNC(hide_io_dialog_cb), children);
gtk_box_pack_start(GTK_BOX(hbox), hide_button, TRUE, TRUE, 8);
gtk_widget_show(hide_button);
-
+
+ if (children->nb)
+ gtk_widget_set_sensitive(hide_button, FALSE);
+
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
hbox);
children->input_hbox = children->open_in ? input_hbox : NULL;
children->input_entry = children->open_in ? entry : NULL;
children->abort_btn = abort_button;
+ children->hide_btn = hide_button;
gtk_widget_show(dialog);
}
+static void catch_status(gpointer data, gint source, GdkInputCondition cond)
+{
+ 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);
+
+ waitpid(-child_info->pid, NULL, 0);
+ childinfo_close_pipes(child_info);
+ child_info->pid = 0;
+
+ wait_for_children(child_info->children);
+}
+
static void catch_input(gpointer data, gint source, GdkInputCondition cond)
{
Children *children = (Children *) data;
gchar *input;
gint c;
+ debug_print(_("Sending input to grand child.\n"));
if (!(cond && GDK_INPUT_WRITE))
return;
gtk_entry_set_text(GTK_ENTRY(children->input_entry), "");
gtk_widget_set_sensitive(children->input_hbox, TRUE);
+ debug_print(_("Input to grand child sent.\n"));
}
static void catch_output(gpointer data, gint source, GdkInputCondition cond)
gint c, i;
gchar buf[PREFSBUFSIZE];
+ debug_print(_("Catching grand child's output.\n"));
if (child_info->type & ACTION_PIPE_OUT
&& source == child_info->chld_out) {
gboolean is_selection = FALSE;
}
gtk_stext_thaw(GTK_STEXT(child_info->text));
} else {
- while (TRUE) {
- c = read(source, buf, PREFSBUFSIZE - 1);
- if (c == 0)
- break;
- for (i = 0; i < c; i++)
- child_info->output = g_string_append_c(
- child_info->output, buf[i]);
+ c = read(source, buf, PREFSBUFSIZE - 1);
+ for (i = 0; i < c; i++)
+ child_info->output = g_string_append_c(
+ child_info->output, buf[i]);
+ if (c > 0)
child_info->new_out = TRUE;
- }
+
+
}
}
projects / claws.git / blobdiff