X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=headers.c;h=8b69cc5d19278f1880d210cf7afae7070f8c703c;hp=193a122b5757704b84fe7b13c0b7b5b860605731;hb=3bea52e9b3eb7c82ee1e6d5368bfb547a89cdb32;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9

diff --git a/headers.c b/headers.c
index 193a122..8b69cc5 100644
--- a/headers.c
+++ b/headers.c
@@ -7,20 +7,11 @@
  * 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/macros.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/file.h>
-#include <lib-lib/debug.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
+#include "alias.h"
 #include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 
@@ -38,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;
   }
@@ -56,8 +47,8 @@ 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);
@@ -69,7 +60,6 @@ void mutt_edit_headers (const char *editor,
   mutt_edit_file (editor, path);
   stat (path, &st);
   if (mtime == st.st_mtime) {
-    debug_print (1, ("temp file was not modified.\n"));
     /* the file has not changed! */
     mutt_unlink (path);
     return;
@@ -86,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;
   }
@@ -94,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. */