Changeset 1909:5e5727753ad1 for commands.c

Timestamp:

2000-06-15 14:15:51 (8 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

patch-1.2.bbell.display_filter.2.

Files:

• commands.c (modified) (4 diffs)

commands.c

@@ -26 +26 @@
 #include "mx.h"
 #include "pager.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #ifdef USE_IMAP
@@ -62 +65 @@
   int rc = 0, builtin = 0;
   int cmflags = M_CM_DECODE | M_CM_DISPLAY | M_CM_CHARCONV;
-  FILE *fpout;
+  FILE *fpout = NULL;
+  FILE *fpfilterout = NULL;
+  pid_t filterpid;
+  int res;
 
   snprintf (buf, sizeof (buf), "%s/%s", TYPE (cur->content),
@@ -108 +114 @@
   }
 
-   mutt_message_hook (cur, M_DISPLAYHOOK);
+  mutt_message_hook (cur, M_DISPLAYHOOK);
+
+  if (DisplayFilter && *DisplayFilter) 
+  {
+    fpfilterout = fpout;
+    fpout = NULL;
+    endwin ();
+    filterpid = mutt_create_filter_fd (DisplayFilter, &fpout, NULL, NULL,
+                                       -1, fileno(fpfilterout), -1);
+    if (filterpid < 0)
+    {
+      mutt_error (_("Cannot create display filter"));
+      fclose (fpfilterout);
+      unlink (tempfile);
+      return 0;
+    }
+  }
 
   if (!Pager || mutt_strcmp (Pager, "builtin") == 0)
@@ -119 +141 @@
   }
 
-  if (mutt_copy_message (fpout, Context, cur, cmflags,
-                         (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | CH_DECODE | CH_FROM) == -1)
-  {
-    fclose (fpout);
-    unlink (tempfile);
+  res = mutt_copy_message (fpout, Context, cur, cmflags,
+        (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | CH_DECODE | CH_FROM);
+  if ((fclose (fpout) != 0 && errno != EPIPE) || res == -1)
+  {
+    mutt_error (_("Could not copy message"));
+    if (fpfilterout != NULL)
+      mutt_wait_filter (filterpid);
+    mutt_unlink (tempfile);
     return 0;
   }
 
-  if (fclose (fpout) != 0 && errno != EPIPE)
-  {
-    mutt_perror ("fclose");
-    mutt_unlink (tempfile);
-    return (0);
-  }
+  if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0)
+    mutt_any_key_to_continue (NULL);
 
 #ifdef HAVE_PGP