X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=b4dbd3a6634d676aa64a565fe7abcf00c9136d1a;hp=fd4bf7756a3c6121a907eec010f4f34fc57200c9;hb=b0811fbd6a0e218c9c310a6ef4170e81540e6c22;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/send.c b/send.c
index fd4bf77..b4dbd3a 100644
--- a/send.c
+++ b/send.c
@@ -12,8 +12,11 @@
 #endif
 
 #include "mutt.h"
+#include "enter.h"
+#include "ascii.h"
 #include "mutt_curses.h"
 #include "rfc2047.h"
+#include "rfc3676.h"
 #include "keymap.h"
 #include "mime.h"
 #include "copy.h"
@@ -21,6 +24,7 @@
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 #include "url.h"
+#include "attach.h"
 
 #include "lib/mem.h"
 #include "lib/intl.h"
@@ -192,7 +196,7 @@ static int edit_address (ADDRESS ** a, /* const */ char *field)
       mutt_error (_("Error: '%s' is a bad IDN."), err);
       mutt_refresh ();
       mutt_sleep (2);
-      FREE (&err);
+      mem_free (&err);
     }
   }
   while (idna_ok != 0);
@@ -213,7 +217,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
       buf[0] = 0;
     if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
       return (-1);
-    FREE (&en->newsgroups);
+    mem_free (&en->newsgroups);
     en->newsgroups = str_dup (buf);
 
     if (en->followup_to)
@@ -223,7 +227,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
     if (option (OPTASKFOLLOWUP)
         && mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
       return (-1);
-    FREE (&en->followup_to);
+    mem_free (&en->followup_to);
     en->followup_to = str_dup (buf);
 
     if (en->x_comment_to)
@@ -233,7 +237,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
     if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
         && mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
       return (-1);
-    FREE (&en->x_comment_to);
+    mem_free (&en->x_comment_to);
     en->x_comment_to = str_dup (buf);
   }
   else
@@ -368,24 +372,6 @@ static void process_user_header (ENVELOPE * env)
   }
 }
 
-LIST *mutt_copy_list (LIST * p)
-{
-  LIST *t, *r = NULL, *l = NULL;
-
-  for (; p; p = p->next) {
-    t = (LIST *) safe_malloc (sizeof (LIST));
-    t->data = str_dup (p->data);
-    t->next = NULL;
-    if (l) {
-      r->next = t;
-      r = r->next;
-    }
-    else
-      l = r = t;
-  }
-  return (l);
-}
-
 void mutt_forward_intro (FILE * fp, HEADER * cur)
 {
   char buffer[STRING];
@@ -659,8 +645,8 @@ void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
    * been taken from a List-Post header.  Is that correct?
    */
   if (curenv->real_subj) {
-    FREE (&env->subject);
-    env->subject = safe_malloc (str_len (curenv->real_subj) + 5);
+    mem_free (&env->subject);
+    env->subject = mem_malloc (str_len (curenv->real_subj) + 5);
     sprintf (env->subject, "Re: %s", curenv->real_subj);        /* __SPRINTF_CHECKED__ */
   }
   else if (!env->subject)
@@ -974,7 +960,7 @@ static ADDRESS *set_reverse_name (ENVELOPE * env)
   if (tmp) {
     tmp = rfc822_cpy_adr_real (tmp);
     if (!option (OPTREVREAL))
-      FREE (&tmp->personal);
+      mem_free (&tmp->personal);
     if (!tmp->personal)
       tmp->personal = str_dup (Realname);
   }
@@ -996,7 +982,7 @@ ADDRESS *mutt_default_from (void)
   else if (option (OPTUSEDOMAIN)) {
     adr = rfc822_new_address ();
     adr->mailbox =
-      safe_malloc (str_len (Username) + str_len (fqdn) + 2);
+      mem_malloc (str_len (Username) + str_len (fqdn) + 2);
     sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn));  /* __SPRINTF_CHECKED__ */
   }
   else {
@@ -1110,6 +1096,7 @@ int ci_send_message (int flags, /* send mode */
   /* save current value of "pgp_sign_as" */
   char *signas = NULL;
   char *tag = NULL, *err = NULL;
+  char *ctype;
 
   int rv = -1;
 
@@ -1190,13 +1177,19 @@ int ci_send_message (int flags, /* send mode */
     pbody->next = msg->content; /* don't kill command-line attachments */
     msg->content = pbody;
 
-    mutt_parse_content_type (ContentType, msg->content);
+    ctype = str_dup (ContentType);
+    mutt_parse_content_type (ctype, msg->content);
+    mem_free (&ctype);
+
     msg->content->unlink = 1;
     msg->content->use_disp = 0;
     msg->content->disposition = DISPINLINE;
     if (option (OPTTEXTFLOWED) && msg->content->type == TYPETEXT
-        && !ascii_strcasecmp (msg->content->subtype, "plain"))
+        && !ascii_strcasecmp (msg->content->subtype, "plain")) {
       mutt_set_parameter ("format", "flowed", &msg->content->parameter);
+      if (option (OPTDELSP))
+        mutt_set_parameter ("delsp", "yes", &msg->content->parameter);
+    }
 
     if (!tempfile) {
       mutt_mktemp (buffer);
@@ -1435,9 +1428,10 @@ int ci_send_message (int flags, /* send mode */
          query_quadoption (OPT_FORWEDIT,
                            _("Edit forwarded message?")) == M_YES)) {
       /* If the this isn't a text message, look for a mailcap edit command */
-      if (mutt_needs_mailcap (msg->content))
-        mutt_edit_attachment (msg->content);
-      else if (!Editor || str_cmp ("builtin", Editor) == 0)
+      if (mutt_needs_mailcap (msg->content)) {
+        if (!mutt_edit_attachment (msg->content))
+          goto cleanup;
+      } else if (!Editor || str_cmp ("builtin", Editor) == 0)
         mutt_builtin_editor (msg->content->filename, msg, cur);
       else if (option (OPTEDITHDRS)) {
         mutt_env_to_local (msg->env);
@@ -1448,6 +1442,9 @@ int ci_send_message (int flags, /* send mode */
       else
         mutt_edit_file (Editor, msg->content->filename);
 
+      if (option (OPTTEXTFLOWED))
+        rfc3676_space_stuff (msg);
+
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
     }
 
@@ -1556,7 +1553,7 @@ int ci_send_message (int flags, /* send mode */
 
   if (mutt_env_to_idna (msg->env, &tag, &err)) {
     mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
-    FREE (&err);
+    mem_free (&err);
     if (!(flags & SENDBATCH))
       goto main_loop;
     else
@@ -1590,6 +1587,20 @@ int ci_send_message (int flags, /* send mode */
   if (msg->content->next)
     msg->content = mutt_make_multipart (msg->content);
 
+  if (mutt_attach_check (msg) &&
+      !msg->content->next &&
+      query_quadoption (OPT_ATTACH,
+                        _("No attachments made but indicator found in text. "
+                          "Cancel sending?")) == M_YES) {
+    if (quadoption (OPT_ATTACH) == M_YES) {
+      mutt_message _("No attachments made but indicator found in text. "
+                     "Abort sending.");
+      sleep (2);
+    }
+    mutt_message (_("Mail not sent."));
+    goto main_loop;
+  }
+
   /* 
    * Ok, we need to do it this way instead of handling all fcc stuff in
    * one place in order to avoid going to main_loop with encoded "env"
@@ -1617,7 +1628,7 @@ int ci_send_message (int flags, /* send mode */
           mutt_protect (msg, pgpkeylist) == -1) {
         msg->content = mutt_remove_multipart (msg->content);
 
-        FREE (&pgpkeylist);
+        mem_free (&pgpkeylist);
 
         decode_descriptions (msg->content);
         goto main_loop;
@@ -1781,7 +1792,7 @@ int ci_send_message (int flags, /* send mode */
 #endif
 
   if (WithCrypto && (msg->security & ENCRYPT))
-    FREE (&pgpkeylist);
+    mem_free (&pgpkeylist);
 
   if (WithCrypto && free_clear_content)
     mutt_free_body (&clear_content);
@@ -1803,7 +1814,7 @@ cleanup:
 
   if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) {
     if (signas) {
-      FREE (&PgpSignAs);
+      mem_free (&PgpSignAs);
       PgpSignAs = signas;
     }
   }