Merge branch '1.5.20-1+fix533459'

[software/mutt-debian.git] / send.c

diff --git a/send.c b/send.c
index 8b47f2c646a5239337e1387d82717ef42d612c28..c509df176b58755872ad605171c9f2751aac2b5e 100644 (file)
--- a/send.c
+++ b/send.c
@@ -59,7 +59,7 @@ static void append_signature (FILE *f)
     if (option (OPTSIGDASHES))
       fputs ("\n-- \n", f);
     mutt_copy_stream (tmpfp, f);
     if (option (OPTSIGDASHES))
       fputs ("\n-- \n", f);
     mutt_copy_stream (tmpfp, f);

-    fclose (tmpfp);
+    safe_fclose (&tmpfp);

     if (thepid != -1)
       mutt_wait_filter (thepid);
   }
     if (thepid != -1)
       mutt_wait_filter (thepid);
   }


@@ -309,7 +309,8 @@ static void process_user_header (ENVELOPE *env)
     else if (ascii_strncasecmp ("to:", uh->data, 3) != 0 &&
             ascii_strncasecmp ("cc:", uh->data, 3) != 0 &&
             ascii_strncasecmp ("bcc:", uh->data, 4) != 0 &&
     else if (ascii_strncasecmp ("to:", uh->data, 3) != 0 &&
             ascii_strncasecmp ("cc:", uh->data, 3) != 0 &&
             ascii_strncasecmp ("bcc:", uh->data, 4) != 0 &&

-            ascii_strncasecmp ("subject:", uh->data, 8) != 0)
+            ascii_strncasecmp ("subject:", uh->data, 8) != 0 &&
+            ascii_strncasecmp ("return-path:", uh->data, 12) != 0)

     {
       if (last)
       {
     {
       if (last)
       {


@@ -387,6 +388,10 @@ static int include_forward (CONTEXT *ctx, HEADER *cur, FILE *out)
   if (option (OPTFORWQUOTE))
     cmflags |= M_CM_PREFIX;
 
   if (option (OPTFORWQUOTE))
     cmflags |= M_CM_PREFIX;
 

+  /* wrapping headers for forwarding is considered a display
+   * rather than send action */
+  chflags |= CH_DISPLAY;
+

   mutt_copy_message (out, ctx, cur, cmflags, chflags);
   mutt_forward_trailer (out);
   return 0;
   mutt_copy_message (out, ctx, cur, cmflags, chflags);
   mutt_forward_trailer (out);
   return 0;


@@ -451,7 +456,7 @@ static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
 
   if (flags && env->mail_followup_to && hmfupto == M_YES) 
   {
 
   if (flags && env->mail_followup_to && hmfupto == M_YES) 
   {

-    rfc822_append (to, env->mail_followup_to);
+    rfc822_append (to, env->mail_followup_to, 1);

     return 0;
   }
 
     return 0;
   }
 


@@ -464,7 +469,7 @@ static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
   if (!option(OPTREPLYSELF) && mutt_addr_is_user (env->from))
   {
     /* mail is from the user, assume replying to recipients */
   if (!option(OPTREPLYSELF) && mutt_addr_is_user (env->from))
   {
     /* mail is from the user, assume replying to recipients */

-    rfc822_append (to, env->to);
+    rfc822_append (to, env->to, 1);

   }
   else if (env->reply_to)
   {
   }
   else if (env->reply_to)
   {


@@ -482,7 +487,7 @@ static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
        * in his From header.
        * 
        */
        * in his From header.
        * 
        */

-      rfc822_append (to, env->from);
+      rfc822_append (to, env->from, 0);

     }
     else if (!(mutt_addrcmp (env->from, env->reply_to) && 
               !env->reply_to->next) &&
     }
     else if (!(mutt_addrcmp (env->from, env->reply_to) && 
               !env->reply_to->next) &&


@@ -499,11 +504,11 @@ static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
       switch (query_quadoption (OPT_REPLYTO, prompt))
       {
       case M_YES:
       switch (query_quadoption (OPT_REPLYTO, prompt))
       {
       case M_YES:

-       rfc822_append (to, env->reply_to);
+       rfc822_append (to, env->reply_to, 0);

        break;
 
       case M_NO:
        break;
 
       case M_NO:

-       rfc822_append (to, env->from);
+       rfc822_append (to, env->from, 0);

        break;
 
       default:
        break;
 
       default:


@@ -511,10 +516,10 @@ static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
       }
     }
     else
       }
     }
     else

-      rfc822_append (to, env->reply_to);
+      rfc822_append (to, env->reply_to, 0);

   }
   else
   }
   else

-    rfc822_append (to, env->from);
+    rfc822_append (to, env->from, 0);

 
   return (0);
 }
 
   return (0);
 }


@@ -538,7 +543,7 @@ int mutt_fetch_recips (ENVELOPE *out, ENVELOPE *in, int flags)
   if (flags & SENDLISTREPLY)
   {
     tmp = find_mailing_lists (in->to, in->cc);
   if (flags & SENDLISTREPLY)
   {
     tmp = find_mailing_lists (in->to, in->cc);

-    rfc822_append (&out->to, tmp);
+    rfc822_append (&out->to, tmp, 0);

     rfc822_free_address (&tmp);
 
     if (in->mail_followup_to && hmfupto == M_YES &&
     rfc822_free_address (&tmp);
 
     if (in->mail_followup_to && hmfupto == M_YES &&


@@ -553,8 +558,8 @@ int mutt_fetch_recips (ENVELOPE *out, ENVELOPE *in, int flags)
     if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES))
     {
       /* if(!mutt_addr_is_user(in->to)) */
     if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES))
     {
       /* if(!mutt_addr_is_user(in->to)) */

-      rfc822_append (&out->cc, in->to);
-      rfc822_append (&out->cc, in->cc);
+      rfc822_append (&out->cc, in->to, 1);
+      rfc822_append (&out->cc, in->cc, 1);

     }
   }
   return 0;
     }
   }
   return 0;


@@ -675,6 +680,12 @@ mutt_make_reference_headers (ENVELOPE *curenv, ENVELOPE *env, CONTEXT *ctx)
   }
   else
     mutt_add_to_reference_headers (env, curenv, NULL, NULL);
   }
   else
     mutt_add_to_reference_headers (env, curenv, NULL, NULL);

+
+  /* if there's more than entry in In-Reply-To (i.e. message has
+     multiple parents), don't generate a References: header as it's
+     discouraged by RfC2822, sect. 3.6.4 */
+  if (ctx->tagged > 0 && env->in_reply_to && env->in_reply_to->next)
+    mutt_free_list (&env->references);

 }
 
 static int
 }
 
 static int


@@ -863,8 +874,8 @@ void mutt_set_followup_to (ENVELOPE *e)
        * mail-followup-to header
        */
 
        * mail-followup-to header
        */
 

-      t = rfc822_append (&e->mail_followup_to, e->to);
-      rfc822_append (&t, e->cc);
+      t = rfc822_append (&e->mail_followup_to, e->to, 0);
+      rfc822_append (&t, e->cc, 1);

     }
 
     /* remove ourselves from the mail-followup-to header */
     }
 
     /* remove ourselves from the mail-followup-to header */


@@ -880,9 +891,9 @@ void mutt_set_followup_to (ENVELOPE *e)
     if (e->mail_followup_to && !mutt_is_list_recipient (0, e->to, e->cc))
     {
       if (e->reply_to)
     if (e->mail_followup_to && !mutt_is_list_recipient (0, e->to, e->cc))
     {
       if (e->reply_to)

-       from = rfc822_cpy_adr (e->reply_to);
+       from = rfc822_cpy_adr (e->reply_to, 0);

       else if (e->from)
       else if (e->from)

-       from = rfc822_cpy_adr (e->from);
+       from = rfc822_cpy_adr (e->from, 0);

       else
        from = mutt_default_from ();
       
       else
        from = mutt_default_from ();
       


@@ -997,7 +1008,7 @@ static int send_message (HEADER *msg)
 
   if ((mutt_write_mime_body (msg->content, tempfp) == -1))
   {
 
   if ((mutt_write_mime_body (msg->content, tempfp) == -1))
   {

-    fclose(tempfp);
+    safe_fclose (&tempfp);

     unlink (tempfile);
     return (-1);
   }
     unlink (tempfile);
     return (-1);
   }


@@ -1082,6 +1093,25 @@ int mutt_resend_message (FILE *fp, CONTEXT *ctx, HEADER *cur)
   return ci_send_message (SENDRESEND, msg, NULL, ctx, cur);
 }
 
   return ci_send_message (SENDRESEND, msg, NULL, ctx, cur);
 }
 

+static int is_reply (HEADER *reply, HEADER *orig)
+{
+  return mutt_find_list (orig->env->references, reply->env->message_id) ||
+         mutt_find_list (orig->env->in_reply_to, reply->env->message_id);
+}
+
+static int has_recips (ADDRESS *a)
+{
+  int c = 0;
+
+  for ( ; a; a = a->next)
+  {
+    if (!a->mailbox || a->group)
+      continue;
+    c++;
+  }
+  return c;
+}
+

 int
 ci_send_message (int flags,            /* send mode */
                 HEADER *msg,           /* template to use for new message */
 int
 ci_send_message (int flags,            /* send mode */
                 HEADER *msg,           /* template to use for new message */


@@ -1541,7 +1571,8 @@ main_loop:
     }
   }
 
     }
   }
 

-  if (!msg->env->to && !msg->env->cc && !msg->env->bcc)
+  if (!has_recips (msg->env->to) && !has_recips (msg->env->cc) &&
+      !has_recips (msg->env->bcc))

   {
     if (! (flags & SENDBATCH))
     {
   {
     if (! (flags & SENDBATCH))
     {


@@ -1665,7 +1696,8 @@ main_loop:
       msg->content = clear_content;
 
     /* check to see if the user wants copies of all attachments */
       msg->content = clear_content;
 
     /* check to see if the user wants copies of all attachments */

-    if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART)
+    if (query_quadoption (OPT_FCCATTACH, _("Save attachments in Fcc?")) != M_YES &&
+       msg->content->type == TYPEMULTIPART)

     {
       if (WithCrypto
           && (mutt_strcmp (msg->content->subtype, "encrypted") == 0 ||
     {
       if (WithCrypto
           && (mutt_strcmp (msg->content->subtype, "encrypted") == 0 ||


@@ -1786,15 +1818,18 @@ full_fcc:
   if (WithCrypto && free_clear_content)
     mutt_free_body (&clear_content);
 
   if (WithCrypto && free_clear_content)
     mutt_free_body (&clear_content);
 

+  /* set 'replied' flag only if the user didn't change/remove
+     In-Reply-To: and References: headers during edit */

   if (flags & SENDREPLY)
   {
     if (cur && ctx)
   if (flags & SENDREPLY)
   {
     if (cur && ctx)

-      mutt_set_flag (ctx, cur, M_REPLIED, 1);
+      mutt_set_flag (ctx, cur, M_REPLIED, is_reply (cur, msg));

     else if (!(flags & SENDPOSTPONED) && ctx && ctx->tagged)
     {
       for (i = 0; i < ctx->vcount; i++)
        if (ctx->hdrs[ctx->v2r[i]]->tagged)
     else if (!(flags & SENDPOSTPONED) && ctx && ctx->tagged)
     {
       for (i = 0; i < ctx->vcount; i++)
        if (ctx->hdrs[ctx->v2r[i]]->tagged)

-         mutt_set_flag (ctx, ctx->hdrs[ctx->v2r[i]], M_REPLIED, 1);
+         mutt_set_flag (ctx, ctx->hdrs[ctx->v2r[i]], M_REPLIED,
+                        is_reply (ctx->hdrs[ctx->v2r[i]], msg));

     }
   }
 
     }
   }