X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=headers.c;h=e9775d579cb35c438c5901d8f97ec684565a66bd;hp=058ec94f4d8b6b1ba3395ae3c6c1c2ddb9e078cc;hb=c76ab67f3430e67b14b381bc1e3a23a14a4053b8;hpb=230399f9632c37b66c1c117a17e8327eae6b3235

diff --git a/headers.c b/headers.c
index 058ec94..e9775d5 100644
--- a/headers.c
+++ b/headers.c
@@ -7,14 +7,6 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
 #include <lib-ui/curses.h>
 
@@ -37,8 +29,8 @@ void mutt_edit_headers (const char *editor,
   struct stat st;
   string_list_t *cur, **last = NULL, *tmp;
 
-  mutt_mktemp (path);
-  if ((ofp = safe_fopen (path, "w")) == NULL) {
+  ofp = m_tempfile(path, sizeof(path), NONULL(Tempdir), NULL);
+  if (!ofp) {
     mutt_perror (path);
     return;
   }
@@ -55,15 +47,15 @@ void mutt_edit_headers (const char *editor,
 
   mutt_copy_stream (ifp, ofp);
 
-  fclose (ifp);
-  fclose (ofp);
+  m_fclose(&ifp);
+  m_fclose(&ofp);
 
   if (stat (path, &st) == -1) {
     mutt_perror (path);
     return;
   }
 
-  mtime = mutt_decrease_mtime (path, &st);
+  mtime = m_decrease_mtime(path, &st);
 
   mutt_edit_file (editor, path);
   stat (path, &st);
@@ -84,7 +76,7 @@ void mutt_edit_headers (const char *editor,
 
   if ((ofp = safe_fopen (body, "w")) == NULL) {
     /* intentionally leak a possible temporary file here */
-    fclose (ifp);
+    m_fclose(&ifp);
     mutt_perror (body);
     return;
   }
@@ -92,8 +84,8 @@ void mutt_edit_headers (const char *editor,
   n = mutt_read_rfc822_header (ifp, NULL, 1, 0);
   while ((i = fread (buffer, 1, sizeof (buffer), ifp)) > 0)
     fwrite (buffer, 1, i, ofp);
-  fclose (ofp);
-  fclose (ifp);
+  m_fclose(&ofp);
+  m_fclose(&ifp);
   mutt_unlink (path);
 
   /* restore old info. */