Revert "we use glibc, and gconv. Don't need our own transcoding stuff, glibc does"

[apps/madmutt.git] / editmsg.c

diff --git a/editmsg.c b/editmsg.c
index 3e2bd0f..09f358f 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -9,22 +9,12 @@
 
 /* simple, editor-based message editing */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/lib-ui.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "copy.h"
-#include "mx.h"
-
-#include "lib/str.h"
-
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <time.h>
 
 /*
  * return value:
@@ -54,7 +44,7 @@ static int edit_one_message (CONTEXT * ctx, HEADER * cur)
 
   struct stat sb;
   time_t mtime = 0;
-  size_t size = 0;
+  ssize_t size = 0;
 
   mutt_mktemp (tmp);
 
@@ -71,8 +61,7 @@ static int edit_one_message (CONTEXT * ctx, HEADER * cur)
   }
 
   rc = mutt_append_message (&tmpctx, ctx, cur, 0, CH_NOLEN |
-                            ((ctx->magic == M_MBOX
-                              || ctx->magic == M_MMDF) ? 0 : CH_NOSTATUS));
+                            (ctx->magic == M_MBOX ? 0 : CH_NOSTATUS));
   oerrno = errno;
 
   mx_close_mailbox (&tmpctx, NULL);
@@ -102,7 +91,7 @@ static int edit_one_message (CONTEXT * ctx, HEADER * cur)
     goto bail;
   }
 
-  mutt_edit_file (NONULL (Editor), tmp);
+  mutt_edit_file(tmp);
 
   if ((rc = stat (tmp, &sb)) == -1) {
     mutt_error (_("Can't stat %s: %s"), tmp, strerror (errno));
@@ -134,14 +123,14 @@ static int edit_one_message (CONTEXT * ctx, HEADER * cur)
   }
 
   of = 0;
-  cf = ((tmpctx.magic == M_MBOX || tmpctx.magic == M_MMDF) ? 0 : CH_NOSTATUS);
+  cf = (tmpctx.magic == M_MBOX ? 0 : CH_NOSTATUS);
 
   if (fgets (buff, sizeof (buff), fp) && is_from (buff, NULL, 0, NULL)) {
-    if (tmpctx.magic == M_MBOX || tmpctx.magic == M_MMDF)
+    if (tmpctx.magic == M_MBOX)
       cf = CH_FROM | CH_FORCE_FROM;
-  }
-  else
+  } else {
     of = M_ADD_FROM;
+  }
 
   /* 
    * XXX - we have to play games with the message flags to avoid
@@ -175,8 +164,7 @@ static int edit_one_message (CONTEXT * ctx, HEADER * cur)
   mx_close_mailbox (&tmpctx, NULL);
 
 bail:
-  if (fp)
-    fclose (fp);
+  m_fclose(&fp);
 
   if (rc >= 0)
     unlink (tmp);