mutt_*mktemp--

[apps/madmutt.git] / compose.c

diff --git a/compose.c b/compose.c
index de3e38b..8a8d0c5 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -11,22 +11,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
 
@@ -35,6 +20,7 @@
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "alias.h"
@@ -43,16 +29,14 @@
 #include "recvattach.h"
 #include "sort.h"
 #include "charset.h"
-#include "mx.h"
 #include "buffy.h"
-#include "compose.h"
 
 #ifdef MIXMASTER
 #include "remailer.h"
 #endif
 
 #ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 static const char *There_are_no_attachments = N_("There are no attachments.");
@@ -313,7 +297,7 @@ static void draw_envelope (HEADER * msg, char *fcc)
 static int edit_address_list (int line, address_t ** addr)
 {
   char buf[HUGE_STRING] = "";   /* needs to be large for alias expansion */
-  const char *err = NULL;
+  char *err = NULL;
 
   mutt_addrlist_to_local (*addr);
   rfc822_write_address (buf, sizeof (buf), *addr, 0);
@@ -442,6 +426,9 @@ static unsigned long cum_attachs_size (MUTTMENU * menu)
  * help when modifying this function.
  */
 
+static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
+                                 const char *p);
+
 static const char *compose_format_str (char *buf, ssize_t buflen, char op,
                                        const char *src, const char *prefix,
                                        const char *ifstring,
@@ -701,7 +688,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       if ((op == OP_COMPOSE_EDIT_HEADERS ||
            (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
         const char *tag = NULL;
-        const char *err = NULL;
+        char *err = NULL;
 
         mutt_env_to_local (msg->env);
         mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
@@ -1178,7 +1165,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           p_delete(&idx[idxlen]);
           continue;
         }
-        fclose (fp);
+        m_fclose(&fp);
 
         if ((idx[idxlen]->content = mutt_make_file_attach (fname)) == NULL) {
           mutt_error