move record as well (yeah, I'm a selfish bitch, I migrate things in my own folder...

[apps/madmutt.git] / headers.c

diff --git a/headers.c b/headers.c
index f158c12..cd3362b 100644 (file)
--- a/headers.c
+++ b/headers.c
@@ -15,9 +15,8 @@
 #include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 
-void mutt_edit_headers (const char *editor,
-                        const char *body,
-                        HEADER * msg, char *fcc, ssize_t fcclen)
+void mutt_edit_headers(const char *body,
+                       HEADER * msg, char *fcc, ssize_t fcclen)
 {
   char path[_POSIX_PATH_MAX];   /* tempfile used to edit headers + body */
   char buffer[LONG_STRING];
@@ -29,7 +28,7 @@ void mutt_edit_headers (const char *editor,
   struct stat st;
   string_list_t *cur, **last = NULL, *tmp;
 
-  ofp = m_tempfile(path, sizeof(path), NONULL(Tempdir), NULL);
+  ofp = m_tempfile(path, sizeof(path), NONULL(MCore.tmpdir), NULL);
   if (!ofp) {
     mutt_perror (path);
     return;
@@ -47,17 +46,17 @@ 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);
+  mutt_edit_file(path);
   stat (path, &st);
   if (mtime == st.st_mtime) {
     /* the file has not changed! */
@@ -76,7 +75,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;
   }
@@ -84,8 +83,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. */