X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=4e283b083b662da4a7efe67b66a24df666fb1a46;hp=d4d3403ac96c7eee7591d917fd19944b79599ea5;hb=f7a7cee0f8bce7ddc378197a9394c6fceb6988ec;hpb=ee1d4d931ca3ebec494694b74a1868a7a2e631e3

diff --git a/compose.c b/compose.c
index d4d3403..4e283b0 100644
--- a/compose.c
+++ b/compose.c
@@ -16,16 +16,19 @@
 #endif
 
 #include "mutt.h"
+#include "enter.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"
 #include "mime.h"
 #include "attach.h"
+#include "recvattach.h"
 #include "mapping.h"
 #include "sort.h"
 #include "charset.h"
 #include "mx.h"
+#include "buffy.h"
 #include "compose.h"
 
 #ifdef MIXMASTER
@@ -220,14 +223,14 @@ static void redraw_mix_line (LIST * chain)
     if (t && t[0] == '0' && t[1] == '\0')
       t = "<random>";
 
-    if (c + safe_strlen (t) + 2 >= COLS - SidebarWidth)
+    if (c + str_len (t) + 2 >= COLS - SidebarWidth)
       break;
 
     addstr (NONULL (t));
     if (chain->next)
       addstr (", ");
 
-    c += safe_strlen (t) + 2;
+    c += str_len (t) + 2;
   }
 }
 #endif /* MIXMASTER */
@@ -336,7 +339,7 @@ static int edit_address_list (int line, ADDRESS ** addr)
   if (mutt_addrlist_to_idna (*addr, &err) != 0) {
     mutt_error (_("Warning: '%s' is a bad IDN."), err);
     mutt_refresh ();
-    FREE (&err);
+    mem_free (&err);
   }
 
   /* redraw the expanded list so the user can see the result */
@@ -372,8 +375,8 @@ 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));
-  FREE (&idx[x]->tree);
-  FREE (&idx[x]);
+  mem_free (&idx[x]->tree);
+  mem_free (&idx[x]);
   for (; x < *idxlen - 1; x++)
     idx[x] = idx[x + 1];
   menu->max = --(*idxlen);
@@ -562,7 +565,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
                          ComposeHelp);
 
   if (option (OPTMBOXPANE))
-    mutt_buffy_check (1);
+    buffy_check (1);
   while (loop) {
 #ifdef USE_NNTP
     unset_option (OPTNEWS);     /* for any case */
@@ -616,9 +619,9 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           buf[0] = 0;
         if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0
             && buf[0]) {
-          FREE (&msg->env->newsgroups);
-          mutt_remove_trailing_ws (buf);
-          msg->env->newsgroups = safe_strdup (mutt_skip_whitespace (buf));
+          mem_free (&msg->env->newsgroups);
+          str_skip_trailws (buf);
+          msg->env->newsgroups = str_dup (str_skip_initws (buf));
           move (HDR_TO, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->newsgroups)
@@ -634,9 +637,9 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           strfcpy (buf, msg->env->followup_to, sizeof (buf));
         if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0
             && buf[0]) {
-          FREE (&msg->env->followup_to);
-          mutt_remove_trailing_ws (buf);
-          msg->env->followup_to = safe_strdup (mutt_skip_whitespace (buf));
+          mem_free (&msg->env->followup_to);
+          str_skip_trailws (buf);
+          msg->env->followup_to = str_dup (str_skip_initws (buf));
           move (HDR_CC, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->followup_to)
@@ -652,8 +655,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           strfcpy (buf, msg->env->x_comment_to, sizeof (buf));
         if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
             && buf[0]) {
-          FREE (&msg->env->x_comment_to);
-          msg->env->x_comment_to = safe_strdup (buf);
+          mem_free (&msg->env->x_comment_to);
+          msg->env->x_comment_to = str_dup (buf);
           move (HDR_BCC, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->x_comment_to)
@@ -693,7 +696,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;
     case OP_COMPOSE_EDIT_MESSAGE:
-      if (Editor && (safe_strcmp ("builtin", Editor) != 0)
+      if (Editor && (str_cmp ("builtin", Editor) != 0)
           && !option (OPTEDITHDRS)) {
         mutt_edit_file (Editor, msg->content->filename);
         mutt_update_encoding (msg->content);
@@ -703,7 +706,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       }
       /* fall through */
     case OP_COMPOSE_EDIT_HEADERS:
-      if (safe_strcmp ("builtin", Editor) != 0 &&
+      if (str_cmp ("builtin", Editor) != 0 &&
           (op == OP_COMPOSE_EDIT_HEADERS ||
            (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
         char *tag = NULL, *err = NULL;
@@ -713,7 +716,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
                            fcc, fcclen);
         if (mutt_env_to_idna (msg->env, &tag, &err)) {
           mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
-          FREE (&err);
+          mem_free (&err);
         }
       }
       else {
@@ -728,7 +731,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       /* attachments may have been added */
       if (idxlen && idx[idxlen - 1]->content->next) {
         for (i = 0; i < idxlen; i++)
-          FREE (&idx[i]);
+          mem_free (&idx[i]);
         idxlen = 0;
         idx =
           mutt_gen_attach_list (msg->content, -1, idx, &idxlen, &idxmax, 0,
@@ -747,18 +750,18 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       if (!(WithCrypto & APPLICATION_PGP))
         break;
       if (idxlen == idxmax) {
-        safe_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5));
+        mem_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5));
         menu->data = idx;
       }
 
-      idx[idxlen] = (ATTACHPTR *) safe_calloc (1, sizeof (ATTACHPTR));
+      idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR));
       if ((idx[idxlen]->content =
            crypt_pgp_make_key_attachment (NULL)) != NULL) {
         update_idx (menu, idx, idxlen++);
         menu->redraw |= REDRAW_INDEX;
       }
       else
-        FREE (&idx[idxlen]);
+        mem_free (&idx[idxlen]);
 
       menu->redraw |= REDRAW_STATUS;
 
@@ -787,7 +790,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           break;
 
         if (idxlen + numfiles >= idxmax) {
-          safe_realloc (&idx,
+          mem_realloc (&idx,
                         sizeof (ATTACHPTR *) * (idxmax += 5 + numfiles));
           menu->data = idx;
         }
@@ -799,18 +802,19 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         for (i = 0; i < numfiles; i++) {
           char *att = files[i];
 
-          idx[idxlen] = (ATTACHPTR *) safe_calloc (1, sizeof (ATTACHPTR));
+          idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR));
+          idx[idxlen]->unowned = 1;
           idx[idxlen]->content = mutt_make_file_attach (att);
           if (idx[idxlen]->content != NULL)
             update_idx (menu, idx, idxlen++);
           else {
             error = 1;
             mutt_error (_("Unable to attach %s!"), att);
-            FREE (&idx[idxlen]);
+            mem_free (&idx[idxlen]);
           }
         }
 
-        FREE (&files);
+        mem_free (&files);
         if (!error)
           mutt_clear_error ();
 
@@ -862,13 +866,13 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
 #endif
           mutt_expand_path (fname, sizeof (fname));
 #ifdef USE_IMAP
-        if (!mx_is_imap (fname))
+        if (mx_get_magic (fname) != M_IMAP)
 #endif
 #ifdef USE_POP
-          if (!mx_is_pop (fname))
+          if (mx_get_magic (fname) != M_POP)
 #endif
 #ifdef USE_NNTP
-            if (!mx_is_nntp (fname) && !option (OPTNEWS))
+            if (mx_get_magic (fname) != M_NNTP && !option (OPTNEWS))
 #endif
               /* check to make sure the file exists and is readable */
               if (access (fname, R_OK) == -1) {
@@ -886,7 +890,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
 
         if (!ctx->msgcount) {
           mx_close_mailbox (ctx, NULL);
-          FREE (&ctx);
+          mem_free (&ctx);
           mutt_error _("No messages in that folder.");
 
           break;
@@ -914,7 +918,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         }
 
         if (idxlen + Context->tagged >= idxmax) {
-          safe_realloc (&idx,
+          mem_realloc (&idx,
                         sizeof (ATTACHPTR *) * (idxmax +=
                                                 5 + Context->tagged));
           menu->data = idx;
@@ -923,14 +927,14 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         for (i = 0; i < Context->msgcount; i++) {
           h = Context->hdrs[i];
           if (h->tagged) {
-            idx[idxlen] = (ATTACHPTR *) safe_calloc (1, sizeof (ATTACHPTR));
+            idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR));
             idx[idxlen]->content = mutt_make_message_attach (Context, h, 1);
             if (idx[idxlen]->content != NULL)
               update_idx (menu, idx, idxlen++);
             else {
               mutt_error _("Unable to attach!");
 
-              FREE (&idx[idxlen]);
+              mem_free (&idx[idxlen]);
             }
           }
         }
@@ -940,7 +944,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           mx_close_mailbox (Context, NULL);
         else
           mx_fastclose_mailbox (Context);
-        FREE (&Context);
+        mem_free (&Context);
 
         /* go back to the folder we started from */
         Context = this;
@@ -953,6 +957,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
 
     case OP_DELETE:
       CHECK_COUNT;
+      if (idx[menu->current]->unowned)
+        idx[menu->current]->content->unlink = 0;
       if (delete_attachment (menu, &idxlen, menu->current) == -1)
         break;
       mutt_update_tree (idx, idxlen);
@@ -1186,15 +1192,15 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           continue;
         }
         if (idxlen == idxmax) {
-          safe_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5));
+          mem_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5));
           menu->data = idx;
         }
 
-        idx[idxlen] = (ATTACHPTR *) safe_calloc (1, sizeof (ATTACHPTR));
+        idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR));
         /* Touch the file */
         if (!(fp = safe_fopen (fname, "w"))) {
           mutt_error (_("Can't create file %s"), fname);
-          FREE (&idx[idxlen]);
+          mem_free (&idx[idxlen]);
           continue;
         }
         fclose (fp);
@@ -1277,11 +1283,13 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           /* avoid freeing other attachments */
           idx[idxlen]->content->next = NULL;
           idx[idxlen]->content->parts = NULL;
+          if (idx[idxlen]->unowned)
+            idx[idxlen]->content->unlink = 0;
           mutt_free_body (&idx[idxlen]->content);
-          FREE (&idx[idxlen]->tree);
-          FREE (&idx[idxlen]);
+          mem_free (&idx[idxlen]->tree);
+          mem_free (&idx[idxlen]);
         }
-        FREE (&idx);
+        mem_free (&idx);
         idxlen = 0;
         idxmax = 0;
         r = -1;
@@ -1412,13 +1420,13 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
     msg->content = idx[0]->content;
     for (i = 0; i < idxlen; i++) {
       idx[i]->content->aptr = NULL;
-      FREE (&idx[i]);
+      mem_free (&idx[i]);
     }
   }
   else
     msg->content = NULL;
 
-  FREE (&idx);
+  mem_free (&idx);
 
   return (r);
 }