1 files changed, 34 insertions, 27 deletions

diff --git a/src/wins.c b/src/wins.c
index 7b7384b..0e4b402 100644
--- a/src/wins.c
+++ b/src/wins.c
@@ -599,33 +599,23 @@ wins_reset (void)
   wins_update ();
 }
 
-/*
- * While inside interactive mode, launch the external command cmd on the given
- * file.
- */
+/* Prepare windows for the execution of an external command. */
 void
-wins_launch_external (const char *file, const char *cmd)
+wins_prepare_external (void)
 {
-  char *p;
-  int len;
-
-  /* Beware of space between cmd and file. */
-  len = strlen (file) + strlen (cmd) + 2;
-
-  p = (char *) mem_calloc (len, sizeof (char));
-  if (snprintf (p, len, "%s %s", cmd, file) == -1)
-    {
-      mem_free (p);
-      return;
-    }
   if (notify_bar ())
     notify_stop_main_thread ();
   def_prog_mode ();
-  endwin ();
   ui_mode = UI_CMDLINE;
   clear ();
   wins_refresh ();
-  (void)system (p);
+  endwin ();
+}
+
+/* Restore windows when returning from an external command. */
+void
+wins_unprepare_external (void)
+{
   reset_prog_mode ();
   clearok (curscr, TRUE);
   curs_set (0);
@@ -633,12 +623,27 @@ wins_launch_external (const char *file, const char *cmd)
   wins_refresh ();
   if (notify_bar ())
     notify_start_main_thread ();
-  mem_free (p);
+}
+
+/*
+ * While inside interactive mode, launch the external command cmd on the given
+ * file.
+ */
+void
+wins_launch_external (char *file, char *cmd)
+{
+  char *arg[] = { cmd, file, NULL };
+  int pid;
+
+  wins_prepare_external ();
+  if ((pid = fork_exec (NULL, NULL, cmd, arg)))
+    child_wait (NULL, NULL, pid);
+  wins_unprepare_external ();
 }
 
 #define NB_CAL_CMDS	27	/* number of commands while in cal view */
-#define NB_APP_CMDS	31	/* same thing while in appointment view */
-#define NB_TOD_CMDS	30	/* same thing while in todo view */
+#define NB_APP_CMDS	32	/* same thing while in appointment view */
+#define NB_TOD_CMDS	31	/* same thing while in todo view */
 #define TOTAL_CMDS	NB_CAL_CMDS + NB_APP_CMDS + NB_TOD_CMDS
 #define CMDS_PER_LINE	6	/* max number of commands per line */
 
@@ -690,6 +695,7 @@ wins_status_bar (void)
   struct binding del    = {_("Del Item"), KEY_DEL_ITEM};
   struct binding edit   = {_("Edit Itm"), KEY_EDIT_ITEM};
   struct binding view   = {_("View"),     KEY_VIEW_ITEM};
+  struct binding pipe   = {_("Pipe"),     KEY_PIPE_ITEM};
   struct binding flag   = {_("Flag Itm"), KEY_FLAG_ITEM};
   struct binding rept   = {_("Repeat"),   KEY_REPEAT_ITEM};
   struct binding enote  = {_("EditNote"), KEY_EDIT_NOTE};
@@ -704,13 +710,14 @@ wins_status_bar (void)
     &gnday, &gpday, &gnweek, &gpweek, &draw, &othr, &today, &conf, &othr,
     /* appointment keys */
     &help, &quit, &save, &chgvu, &import, &export, &add, &del, &edit, &view,
-    &draw, &othr, &rept, &flag, &enote, &vnote, &up, &down, &gnday, &gpday,
-    &gnweek, &gpweek, &togo, &othr, &today, &conf, &appt, &todo, &cut, &paste,
-    &othr,
+    &pipe, &othr, &draw, &rept, &flag, &enote, &vnote, &up, &down, &gnday,
+    &gpday, &gnweek, &gpweek, &othr, &togo, &today, &conf, &appt, &todo, &cut,
+    &paste, &othr,
     /* todo keys */
     &help, &quit, &save, &chgvu, &import, &export, &add, &del, &edit, &view,
-    &flag, &othr, &rprio, &lprio, &enote, &vnote, &up, &down, &gnday, &gpday,
-    &gnweek, &gpweek, &togo, &othr, &today, &conf, &appt, &todo, &draw, &othr
+    &pipe, &othr, &flag, &rprio, &lprio, &enote, &vnote, &up, &down, &gnday,
+    &gpday, &gnweek, &gpweek, &othr, &togo, &today, &conf, &appt, &todo, &draw,
+    &othr
   };
 
   /* Drawing the keybinding with attribute and label without. */