Use m_tempfile and better errors msg

[apps/madmutt.git] / handler.c

diff --git a/handler.c b/handler.c
index cc0a3c1..59c70de 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -1083,7 +1083,7 @@ static int autoview_handler (BODY * a, STATE * s)
     mutt_copy_bytes (s->fpin, fpin, a->length);
 
     if (!piped) {
-      safe_fclose (&fpin);
+      m_fclose(&fpin);
       thepid = mutt_create_filter (command, NULL, &fpout, &fperr);
     }
     else {
@@ -1140,12 +1140,12 @@ static int autoview_handler (BODY * a, STATE * s)
     }
 
   bail:
-    safe_fclose (&fpout);
-    safe_fclose (&fperr);
+    m_fclose(&fpout);
+    m_fclose(&fperr);
 
     mutt_wait_filter (thepid);
     if (piped)
-      safe_fclose (&fpin);
+      m_fclose(&fpin);
     else
       mutt_unlink (tempfile);
 
@@ -1415,7 +1415,7 @@ int mutt_body_handler (BODY * b, STATE * s)
       if (decode) {
         b->length = ftello (s->fpout);
         b->offset = 0;
-        fclose (s->fpout);
+        m_fclose(&s->fpout);
 
         /* restore final destination and substitute the tempfile for input */
         s->fpout = fp;
@@ -1439,7 +1439,7 @@ int mutt_body_handler (BODY * b, STATE * s)
         b->offset = tmpoffset;
 
         /* restore the original source stream */
-        fclose (s->fpin);
+        m_fclose(&s->fpin);
         s->fpin = fp;
       }
     }