X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=0403bc53c396de89a5b92f78b356bc535b01eeb6;hp=760651c74dd5b91449cb46a51c9a074a81ba6c1e;hb=3de2c85955793f4d6898884915121959ca465d0f;hpb=8476307969a605bea67f6b702b0c1e7a52038bed

diff --git a/recvattach.c b/recvattach.c
index 760651c..0403bc5 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -505,14 +505,14 @@ void mutt_save_attachment_list (FILE * fp, int tag, BODY * top, HEADER * hdr,
           rc = mutt_save_attachment (fp, top, tfile, append, hdr);
           if (rc == 0 && AttachSep && (fpout = fopen (tfile, "a")) != NULL) {
             fprintf (fpout, "%s", AttachSep);
-            fclose (fpout);
+            m_fclose(&fpout);
           }
         }
         else {
           rc = mutt_save_attachment (fp, top, tfile, M_SAVE_APPEND, hdr);
           if (rc == 0 && AttachSep && (fpout = fopen (tfile, "a")) != NULL) {
             fprintf (fpout, "%s", AttachSep);
-            fclose (fpout);
+            m_fclose(&fpout);
           }
         }
       }
@@ -597,7 +597,7 @@ static void pipe_attachment (FILE * fp, BODY * b, STATE * state)
       return;
     }
     mutt_copy_stream (ifp, state->fpout);
-    fclose (ifp);
+    m_fclose(&ifp);
     if (AttachSep)
       state_puts (AttachSep, state);
   }
@@ -643,7 +643,7 @@ void mutt_pipe_attachment_list (FILE * fp, int tag, BODY * top, int afilter)
     mutt_endwin (NULL);
     thepid = mutt_create_filter (buf, &state.fpout, NULL, NULL);
     pipe_attachment_list (buf, fp, tag, top, afilter, &state);
-    fclose (state.fpout);
+    m_fclose(&state.fpout);
     if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY))
       mutt_any_key_to_continue (NULL);
   }
@@ -701,7 +701,7 @@ static void print_attachment_list (FILE * fp, int tag, BODY * top,
               0) {
             if ((ifp = fopen (newfile, "r")) != NULL) {
               mutt_copy_stream (ifp, state->fpout);
-              fclose (ifp);
+              m_fclose(&ifp);
               if (AttachSep)
                 state_puts (AttachSep, state);
             }
@@ -738,7 +738,7 @@ void mutt_print_attachment_list (FILE * fp, int tag, BODY * top)
     p_clear(&state, 1);
     thepid = mutt_create_filter (NONULL (PrintCmd), &state.fpout, NULL, NULL);
     print_attachment_list (fp, tag, top, &state);
-    fclose (state.fpout);
+    m_fclose(&state.fpout);
     if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY))
       mutt_any_key_to_continue (NULL);
   }
@@ -776,12 +776,6 @@ mutt_attach_display_loop (MUTTMENU * menu, int op, FILE * fp, HEADER * hdr,
 {
   ATTACHPTR **idx = *idxp;
 
-#if 0
-  int old_optweed = option (OPTWEED);
-
-  set_option (OPTWEED);
-#endif
-
   do {
     switch (op) {
     case OP_DISPLAY_HEADERS:
@@ -837,10 +831,6 @@ mutt_attach_display_loop (MUTTMENU * menu, int op, FILE * fp, HEADER * hdr,
   }
   while (op != OP_NULL);
 
-#if 0
-  if (option (OPTWEED) != old_optweed)
-    toggle_option (OPTWEED);
-#endif
   return op;
 }
 
@@ -938,7 +928,7 @@ void mutt_view_attachments (HEADER * hdr)
           secured = !crypt_smime_decrypt_mime (_fp, &fp, _cur, &cur);
 
           body_list_wipe(&_cur);
-          safe_fclose (&_fp);
+          m_fclose(&_fp);
         }
       }
       else
@@ -1228,7 +1218,7 @@ void mutt_view_attachments (HEADER * hdr)
       idxmax = 0;
 
       if (need_secured && secured) {
-        fclose (fp);
+        m_fclose(&fp);
         body_list_wipe(&cur);
       }