Changeset 402:98bc92448192 for attach.c

Timestamp:

1998-10-05 23:07:55 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Fix another pipe-related hang in mutt_view_attachment().

Files:

• attach.c (modified) (4 diffs)

attach.c

@@ -359 +359 @@
                                  tempfile, sizeof (tempfile)))
     {
-      if (fp == NULL)
+      if (fp == NULL && strcmp(tempfile, a->filename))
       {
         /* send case: the file is already there */
@@ -404 +404 @@
   {
     pid_t thepid = 0;
-    FILE *pagerfp = NULL;
-    FILE *tempfp = NULL;
-    FILE *filter_in;
-    FILE *filter_out;
-
+    int tempfd = -1, pagerfd = -1;
+    
     if (!use_pager)
       endwin ();
@@ -414 +411 @@
     if (use_pager || use_pipe)
     {
-      if (use_pager && ((pagerfp = safe_fopen (pagerfile, "w")) == NULL))
-      {
-        mutt_perror ("fopen");
+      if (use_pager && ((pagerfd = safe_open (pagerfile, O_CREAT | O_EXCL | O_WRONLY)) == -1))
+      {
+        mutt_perror ("open");
         goto return_error;
       }
-      if (use_pipe && ((tempfp = fopen (tempfile, "r")) == NULL))
-      {
-        if (pagerfp)
-          fclose (pagerfp);
-        mutt_perror ("fopen");
+      if (use_pipe && ((tempfd = open (tempfile, 0)) == -1))
+      {
+        if(pagerfd != -1)
+          close(pagerfd);
+        mutt_perror ("open");
         goto return_error;
       }
 
-      if ((thepid = mutt_create_filter (command, use_pipe ? &filter_in : NULL,
-                                        use_pager ? &filter_out : NULL, NULL)) == -1)
-      {
-        if (pagerfp)
-          fclose (pagerfp);
-        if (tempfp)
-          fclose (tempfp);
+      if ((thepid = mutt_create_filter_fd (command, NULL, NULL, NULL,
+                                           use_pipe ? tempfd : -1, use_pager ? pagerfd : -1, -1)) == -1)
+      {
+        if(pagerfd != -1)
+          close(pagerfd);
+        
+        if(tempfd != -1)
+          close(tempfd);
+
         mutt_error _("Cannot create filter");
         goto return_error;
       }
 
-      if (use_pipe)
-      {
-        mutt_copy_stream (tempfp, filter_in);
-        fclose (tempfp);
-        fclose (filter_in);
-      }
       if (use_pager)
       {
-        mutt_copy_stream (filter_out, pagerfp);
-        fclose (filter_out);
-        fclose (pagerfp);
         if (a->description)
           snprintf (descrip, sizeof (descrip),
@@ -461 +451 @@
           option (OPTWAITKEY))) && !use_pager)
         mutt_any_key_to_continue (NULL);
+      
+      close(tempfd);
+      close(pagerfd);
+      
     }
     else