X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postpone.c;h=d8d8cf5979afdaf8a8c04c696c64e6bea7e30976;hb=9ed7a487e3a922f2cbb222961c2c9710c3a65f91;hp=9b4e0a630f64f620c0730e2fc408f30ac2daac02;hpb=230399f9632c37b66c1c117a17e8327eae6b3235;p=apps%2Fmadmutt.git

diff --git a/postpone.c b/postpone.c
index 9b4e0a6..d8d8cf5 100644
--- a/postpone.c
+++ b/postpone.c
@@ -8,31 +8,24 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/stat.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
 
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
+#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
+
+#include <lib-sys/unix.h>
 
 #include "mutt.h"
 #include "handler.h"
 #include "sort.h"
 #include "thread.h"
-#include "mx.h"
 #include <lib-crypt/crypt.h>
 
 #include <imap/imap.h>
-#include <imap/mx_imap.h>
 
 static struct mapping_t PostponeHelp[] = {
   {N_("Exit"),  OP_EXIT},
@@ -629,7 +622,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
     else
       mutt_decode_attachment (b, &s);
 
-    if (safe_fclose (&s.fpout) != 0)
+    if (m_fclose(&s.fpout) != 0)
       goto bail;
 
     m_strreplace(&b->filename, file);
@@ -663,7 +656,7 @@ bail:
 
   /* that's it. */
   if (bfp != fp)
-    fclose (bfp);
+    m_fclose(&bfp);
   if (msg)
     mx_close_message (&msg);