Use m_tempfile and better errors msg

[apps/madmutt.git] / compose.c

diff --git a/compose.c b/compose.c
index 538d5ad..8a8d0c5 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -11,49 +11,34 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.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-sys/unix.h>
 
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
-#include "enter.h"
+#include "alias.h"
 #include "mutt_idna.h"
-#include "mutt_menu.h"
-#include "rfc1524.h"
 #include "attach.h"
 #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
 
-
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-
 static const char *There_are_no_attachments = N_("There are no attachments.");
 
 #define CHECK_COUNT if (idxlen == 0) { mutt_error _(There_are_no_attachments); break; }
@@ -197,7 +182,7 @@ static void redraw_crypt_lines (HEADER * msg)
 
 #ifdef MIXMASTER
 
-static void redraw_mix_line (LIST * chain)
+static void redraw_mix_line (string_list_t * chain)
 {
   int c;
   const char *t;
@@ -317,7 +302,7 @@ static int edit_address_list (int line, address_t ** addr)
   mutt_addrlist_to_local (*addr);
   rfc822_write_address (buf, sizeof (buf), *addr, 0);
   if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) {
-    address_delete (addr);
+    address_list_wipe(addr);
     *addr = mutt_parse_adrlist (*addr, buf);
     *addr = mutt_expand_aliases (*addr);
   }
@@ -365,7 +350,7 @@ static int delete_attachment (MUTTMENU * menu, short *idxlen, int x)
 
   idx[x]->content->next = NULL;
   idx[x]->content->parts = NULL;
-  mutt_free_body (&(idx[x]->content));
+  body_list_wipe(&(idx[x]->content));
   p_delete(&idx[x]->tree);
   p_delete(&idx[x]);
   for (; x < *idxlen - 1; x++)
@@ -399,7 +384,7 @@ static void update_idx (MUTTMENU * menu, ATTACHPTR ** idx, short idxlen)
 
 static unsigned long cum_attachs_size (MUTTMENU * menu)
 {
-  size_t s;
+  ssize_t s;
   unsigned short i;
   ATTACHPTR **idx = menu->data;
   CONTENT *info;
@@ -441,7 +426,10 @@ static unsigned long cum_attachs_size (MUTTMENU * menu)
  * help when modifying this function.
  */
 
-static const char *compose_format_str (char *buf, size_t buflen, char op,
+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,
                                        const char *elsestring,
@@ -507,7 +495,8 @@ static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
  */
 int mutt_compose_menu (HEADER * msg,    /* structure for new message */
                        char *fcc,       /* where to save a copy of the message */
-                       size_t fcclen, HEADER * cur)
+                       ssize_t fcclen,
+                       HEADER * cur __attribute__ ((unused)))
 {                               /* current message */
   char helpstr[SHORT_STRING];
   char buf[LONG_STRING];
@@ -699,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,
@@ -1176,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
@@ -1258,7 +1247,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           idx[idxlen]->content->parts = NULL;
           if (idx[idxlen]->unowned)
             idx[idxlen]->content->unlink = 0;
-          mutt_free_body (&idx[idxlen]->content);
+          body_list_wipe(&idx[idxlen]->content);
           p_delete(&idx[idxlen]->tree);
           p_delete(&idx[idxlen]);
         }