X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=32370e34b544f5e14b896bb06af295d4257c0a69;hp=e932ee2e2ba3bad0471c5a182d31d0f7fd6068e5;hb=700dbab719f75421b81f8c603d239bbf38cfa6f9;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/send.c b/send.c
index e932ee2..32370e3 100644
--- a/send.c
+++ b/send.c
@@ -12,20 +12,24 @@
 #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 "mailbox.h"
 #include "copy.h"
 #include "mx.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 #include "url.h"
+#include "attach.h"
 
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -174,7 +178,7 @@ static ADDRESS *find_mailing_lists (ADDRESS * t, ADDRESS * c)
   return top;
 }
 
-static int edit_address (ADDRESS ** a, /* const */ char *field)
+static int edit_address (ADDRESS ** a, const char *field)
 {
   char buf[HUGE_STRING];
   char *err = NULL;
@@ -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,8 +217,8 @@ 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);
-    en->newsgroups = safe_strdup (buf);
+    mem_free (&en->newsgroups);
+    en->newsgroups = str_dup (buf);
 
     if (en->followup_to)
       strfcpy (buf, en->followup_to, sizeof (buf));
@@ -223,8 +227,8 @@ 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);
-    en->followup_to = safe_strdup (buf);
+    mem_free (&en->followup_to);
+    en->followup_to = str_dup (buf);
 
     if (en->x_comment_to)
       strfcpy (buf, en->x_comment_to, sizeof (buf));
@@ -233,8 +237,8 @@ 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);
-    en->x_comment_to = safe_strdup (buf);
+    mem_free (&en->x_comment_to);
+    en->x_comment_to = str_dup (buf);
   }
   else
 #endif
@@ -291,7 +295,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
 
     return (-1);
   }
-  mutt_str_replace (&en->subject, buf);
+  str_replace (&en->subject, buf);
 
   return 0;
 }
@@ -300,7 +304,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
 char *nntp_get_header (const char *s)
 {
   SKIPWS (s);
-  return safe_strdup (s);
+  return str_dup (s);
 }
 #endif
 
@@ -346,7 +350,7 @@ static void process_user_header (ENVELOPE * env)
       env->reply_to = rfc822_parse_adrlist (env->reply_to, uh->data + 9);
     }
     else if (ascii_strncasecmp ("message-id:", uh->data, 11) == 0)
-      mutt_str_replace (&env->message_id, uh->data + 11);
+      str_replace (&env->message_id, uh->data + 11);
     else if (ascii_strncasecmp ("to:", uh->data, 3) != 0 &&
              ascii_strncasecmp ("cc:", uh->data, 3) != 0 &&
              ascii_strncasecmp ("bcc:", uh->data, 4) != 0 &&
@@ -363,29 +367,11 @@ static void process_user_header (ENVELOPE * env)
       }
       else
         last = env->userhdrs = mutt_new_list ();
-      last->data = safe_strdup (uh->data);
+      last->data = str_dup (uh->data);
     }
   }
 }
 
-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 = safe_strdup (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];
@@ -504,10 +490,9 @@ static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto)
    */
   if (!(flags & SENDGROUPREPLY) && mutt_is_list_cc (0, env->to, env->cc)) {
     switch (query_quadoption (OPT_LISTREPLY,
-                              _
-                              ("Message came from a mailing list. Reply to author only?")))
+                              _("Message came from a mailing list. List-reply to mailing list?")))
     {
-    case M_NO:
+    case M_YES:
       tmp = find_mailing_lists (env->to, env->cc);
       rfc822_append (to, tmp);
       rfc822_free_address (&tmp);
@@ -617,7 +602,7 @@ LIST *mutt_make_references (ENVELOPE * e)
 
   if (e->message_id) {
     t = mutt_new_list ();
-    t->data = safe_strdup (e->message_id);
+    t->data = str_dup (e->message_id);
     t->next = l;
     l = t;
   }
@@ -641,6 +626,11 @@ void mutt_fix_reply_recipients (ENVELOPE * env)
   env->to = mutt_remove_duplicates (env->to);
   env->cc = mutt_remove_duplicates (env->cc);
   env->cc = mutt_remove_xrefs (env->to, env->cc);
+
+  if (env->cc && !env->to) {
+    env->to = env->cc;
+    env->cc = NULL;
+  }
 }
 
 void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur)
@@ -649,7 +639,7 @@ void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur)
 
   /* set the default subject for the message. */
   mutt_make_string (buffer, sizeof (buffer), NONULL (ForwFmt), ctx, cur);
-  mutt_str_replace (&env->subject, buffer);
+  str_replace (&env->subject, buffer);
 }
 
 void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
@@ -659,16 +649,16 @@ 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 (mutt_strlen (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)
-    env->subject = safe_strdup ("Re: your mail");
+    env->subject = str_dup ("Re: your mail");
 
 #ifdef USE_NNTP
   if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from)
-    env->x_comment_to = safe_strdup (mutt_get_name (curenv->from));
+    env->x_comment_to = str_dup (mutt_get_name (curenv->from));
 #endif
 }
 
@@ -696,7 +686,7 @@ void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,
 
   if (curenv->message_id) {
     *q = mutt_new_list ();
-    (*q)->data = safe_strdup (curenv->message_id);
+    (*q)->data = str_dup (curenv->message_id);
   }
 
   if (pp)
@@ -759,8 +749,8 @@ envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags)
     if ((flags & SENDNEWS)) {
       /* in case followup set Newsgroups: with Followup-To: if it present */
       if (!env->newsgroups && curenv &&
-          mutt_strcasecmp (curenv->followup_to, "poster"))
-        env->newsgroups = safe_strdup (curenv->followup_to);
+          str_casecmp (curenv->followup_to, "poster"))
+        env->newsgroups = str_dup (curenv->followup_to);
     }
     else
 #endif
@@ -903,7 +893,7 @@ void mutt_set_followup_to (ENVELOPE * e)
 #ifdef USE_NNTP
   if (option (OPTNEWSSEND)) {
     if (!e->followup_to && e->newsgroups && (strrchr (e->newsgroups, ',')))
-      e->followup_to = safe_strdup (e->newsgroups);
+      e->followup_to = str_dup (e->newsgroups);
     return;
   }
 #endif
@@ -974,9 +964,9 @@ 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 = safe_strdup (Realname);
+      tmp->personal = str_dup (Realname);
   }
   return (tmp);
 }
@@ -996,12 +986,12 @@ ADDRESS *mutt_default_from (void)
   else if (option (OPTUSEDOMAIN)) {
     adr = rfc822_new_address ();
     adr->mailbox =
-      safe_malloc (mutt_strlen (Username) + mutt_strlen (fqdn) + 2);
+      mem_malloc (str_len (Username) + str_len (fqdn) + 2);
     sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn));  /* __SPRINTF_CHECKED__ */
   }
   else {
     adr = rfc822_new_address ();
-    adr->mailbox = safe_strdup (NONULL (Username));
+    adr->mailbox = str_dup (NONULL (Username));
   }
 
   return (adr);
@@ -1079,6 +1069,19 @@ static void decode_descriptions (BODY * b)
   }
 }
 
+static void fix_end_of_file (const char *data)
+{
+  FILE *fp;
+  int c;
+
+  if ((fp = safe_fopen (data, "a+")) == NULL)
+    return;
+  fseeko (fp, -1, SEEK_END);
+  if ((c = fgetc (fp)) != '\n')
+    fputc ('\n', fp);
+  safe_fclose (&fp);
+}
+
 int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur)
 {
   HEADER *msg = mutt_new_header ();
@@ -1108,8 +1111,9 @@ int ci_send_message (int flags, /* send mode */
   char *pgpkeylist = NULL;
 
   /* save current value of "pgp_sign_as" */
-  char *signas = NULL;
-  char *tag = NULL, *err = NULL;
+  char *signas = NULL, *err = NULL;
+  const char *tag = NULL;
+  char *ctype;
 
   int rv = -1;
 
@@ -1135,7 +1139,7 @@ int ci_send_message (int flags, /* send mode */
 
 
   if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED))
-    signas = safe_strdup (PgpSignAs);
+    signas = str_dup (PgpSignAs);
 
   /* Delay expansion of aliases until absolutely necessary--shouldn't
    * be necessary unless we are prompting the user or about to execute a
@@ -1190,29 +1194,34 @@ 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);
+    if (!(ctype = str_dup (ContentType)))
+      ctype = str_dup ("text/plain");
+    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);
       tempfp = safe_fopen (buffer, "w+");
-      msg->content->filename = safe_strdup (buffer);
+      msg->content->filename = str_dup (buffer);
     }
     else {
       tempfp = safe_fopen (tempfile, "a+");
-      msg->content->filename = safe_strdup (tempfile);
+      msg->content->filename = str_dup (tempfile);
     }
 
     if (!tempfp) {
-      dprint (1,
-              (debugfile,
-               "newsend_message: can't create tempfile %s (errno=%d)\n",
-               msg->content->filename, errno));
+      debug_print (1, ("can't create tempfile %s (errno=%d)\n", 
+                  msg->content->filename, errno));
       mutt_perror (msg->content->filename);
       goto cleanup;
     }
@@ -1261,7 +1270,7 @@ int ci_send_message (int flags, /* send mode */
 #ifdef USE_NNTP
     if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP
         && !msg->env->newsgroups)
-      msg->env->newsgroups = safe_strdup (((NNTP_DATA *) ctx->data)->group);
+      msg->env->newsgroups = str_dup (((NNTP_DATA *) ctx->data)->group);
 #endif
 
     if (!(flags & SENDMAILX) &&
@@ -1316,7 +1325,7 @@ int ci_send_message (int flags, /* send mode */
 
     if (option (OPTSIGONTOP)
         && (!(flags & (SENDMAILX | SENDKEY)) && Editor
-            && mutt_strcmp (Editor, "builtin") != 0))
+            && str_cmp (Editor, "builtin") != 0))
       append_signature (tempfp);
 
     /* include replies/forwarded messages, unless we are given a template */
@@ -1326,7 +1335,7 @@ int ci_send_message (int flags, /* send mode */
 
     if (!option (OPTSIGONTOP)
         && (!(flags & (SENDMAILX | SENDKEY)) && Editor
-            && mutt_strcmp (Editor, "builtin") != 0))
+            && str_cmp (Editor, "builtin") != 0))
       append_signature (tempfp);
 
     /* 
@@ -1406,7 +1415,7 @@ int ci_send_message (int flags, /* send mode */
      that $realname can be set in a send-hook */
   if (msg->env->from && !msg->env->from->personal
       && !(flags & (SENDRESEND | SENDPOSTPONED)))
-    msg->env->from->personal = safe_strdup (Realname);
+    msg->env->from->personal = str_dup (Realname);
 
   if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)))
     safe_fclose (&tempfp);
@@ -1437,9 +1446,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 || mutt_strcmp ("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);
@@ -1447,9 +1457,19 @@ int ci_send_message (int flags, /* send mode */
                            sizeof (fcc));
         mutt_env_to_idna (msg->env, NULL, NULL);
       }
-      else
+      else {
         mutt_edit_file (Editor, msg->content->filename);
 
+        if (stat (msg->content->filename, &st) == 0) {
+          if (mtime != st.st_mtime)
+            fix_end_of_file (msg->content->filename);
+        } else
+          mutt_perror (msg->content->filename);
+      }
+
+      if (option (OPTTEXTFLOWED))
+        rfc3676_space_stuff (msg);
+
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
     }
 
@@ -1558,7 +1578,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
@@ -1592,6 +1612,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"
@@ -1619,7 +1653,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;
@@ -1663,11 +1697,11 @@ int ci_send_message (int flags, /* send mode */
    */
 
 #ifdef USE_IMAP
-  if ((flags & SENDBATCH) && fcc[0] && mx_is_imap (fcc))
+  if ((flags & SENDBATCH) && fcc[0] && mx_get_magic (fcc) == M_IMAP)
     fcc[0] = '\0';
 #endif
 
-  if (*fcc && mutt_strcmp ("/dev/null", fcc) != 0) {
+  if (*fcc && str_cmp ("/dev/null", fcc) != 0) {
     BODY *tmpbody = msg->content;
     BODY *save_sig = NULL;
     BODY *save_parts = NULL;
@@ -1678,8 +1712,8 @@ int ci_send_message (int flags, /* send mode */
     /* check to see if the user wants copies of all attachments */
     if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART) {
       if (WithCrypto
-          && (mutt_strcmp (msg->content->subtype, "encrypted") == 0 ||
-              mutt_strcmp (msg->content->subtype, "signed") == 0)) {
+          && (str_cmp (msg->content->subtype, "encrypted") == 0 ||
+              str_cmp (msg->content->subtype, "signed") == 0)) {
         if (clear_content->type == TYPEMULTIPART) {
           if (!(msg->security & ENCRYPT) && (msg->security & SIGN)) {
             /* save initial signature and attachments */
@@ -1783,7 +1817,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);
@@ -1805,7 +1839,7 @@ cleanup:
 
   if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) {
     if (signas) {
-      FREE (&PgpSignAs);
+      mem_free (&PgpSignAs);
       PgpSignAs = signas;
     }
   }