if (tmp)
{
tmp = rfc822_cpy_adr_real (tmp);
+ /* when $reverse_realname is not set, clear the personal name so that it
+ * may be set vi a reply- or send-hook.
+ */
if (!option (OPTREVREAL))
FREE (&tmp->personal);
- if (!tmp->personal)
- tmp->personal = safe_strdup (Realname);
}
return (tmp);
}
#endif
/* Write out the message in MIME form. */
- mutt_mktemp (tempfile);
+ mutt_mktemp (tempfile, sizeof (tempfile));
if ((tempfp = safe_fopen (tempfile, "w")) == NULL)
return (-1);
if (!tempfile)
{
- mutt_mktemp (buffer);
+ mutt_mktemp (buffer, sizeof (buffer));
tempfp = safe_fopen (buffer, "w+");
msg->content->filename = safe_strdup (buffer);
}
msg->env->from = set_reverse_name (cur->env);
}
- if (!msg->env->from && option (OPTUSEFROM) && !(flags & (SENDPOSTPONED|SENDRESEND)))
- {
- msg->env->from = mutt_default_from ();
- if (!(flags & SENDBATCH))
- killfrom = 1; /* $use_from will be re-checked after send-hooks */
- }
-
- if (flags & SENDBATCH)
- {
- mutt_copy_stream (stdin, tempfp);
- if (option (OPTHDRS))
- {
- process_user_recips (msg->env);
- process_user_header (msg->env);
- }
- mutt_expand_aliases_env (msg->env);
- }
- else if (! (flags & (SENDPOSTPONED|SENDRESEND)))
+ if (! (flags & (SENDPOSTPONED|SENDRESEND)))
{
if ((flags & (SENDREPLY | SENDFORWARD)) && ctx &&
envelope_defaults (msg->env, ctx, cur, flags) == -1)
if (flags & SENDREPLY)
mutt_fix_reply_recipients (msg->env);
- if (! (flags & SENDMAILX) &&
+ if (! (flags & (SENDMAILX|SENDBATCH)) &&
! (option (OPTAUTOEDIT) && option (OPTEDITHDRS)) &&
! ((flags & SENDREPLY) && option (OPTFASTREPLY)))
{
if (option (OPTHDRS))
process_user_header (msg->env);
+ if (flags & SENDBATCH)
+ mutt_copy_stream (stdin, tempfp);
- if (option (OPTSIGONTOP) && (! (flags & (SENDMAILX | SENDKEY)) && Editor && mutt_strcmp (Editor, "builtin") != 0))
+ if (option (OPTSIGONTOP) && ! (flags & (SENDMAILX|SENDKEY|SENDBATCH))
+ && Editor && mutt_strcmp (Editor, "builtin") != 0)
append_signature (tempfp);
/* include replies/forwarded messages, unless we are given a template */
&& generate_body (tempfp, msg, flags, ctx, cur) == -1)
goto cleanup;
- if (!option (OPTSIGONTOP) && (! (flags & (SENDMAILX | SENDKEY)) && Editor && mutt_strcmp (Editor, "builtin") != 0))
+ if (!option (OPTSIGONTOP) && ! (flags & (SENDMAILX|SENDKEY|SENDBATCH))
+ && Editor && mutt_strcmp (Editor, "builtin") != 0)
append_signature (tempfp);
-
- /*
- * this wants to be done _after_ generate_body, so message-hooks
- * can take effect.
- */
-
- if (WithCrypto && !(flags & SENDMAILX))
- {
- if (option (OPTCRYPTAUTOSIGN))
- msg->security |= SIGN;
- if (option (OPTCRYPTAUTOENCRYPT))
- msg->security |= ENCRYPT;
- if (option (OPTCRYPTREPLYENCRYPT) && cur && (cur->security & ENCRYPT))
- msg->security |= ENCRYPT;
- if (option (OPTCRYPTREPLYSIGN) && cur && (cur->security & SIGN))
- msg->security |= SIGN;
- if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur && (cur->security & ENCRYPT))
- msg->security |= SIGN;
- if (WithCrypto & APPLICATION_PGP && (msg->security & (ENCRYPT | SIGN)))
- {
- if (option (OPTPGPAUTOINLINE))
- msg->security |= INLINE;
- if (option (OPTPGPREPLYINLINE) && cur && (cur->security & INLINE))
- msg->security |= INLINE;
- }
- }
-
- if (WithCrypto && msg->security)
- {
- /*
- * When reypling / forwarding, use the original message's
- * crypto system. According to the documentation,
- * smime_is_default should be disregarded here.
- *
- * Problem: At least with forwarding, this doesn't really
- * make much sense. Should we have an option to completely
- * disable individual mechanisms at run-time?
- */
- if (cur)
- {
- if ((WithCrypto & APPLICATION_PGP) && option (OPTCRYPTAUTOPGP)
- && (cur->security & APPLICATION_PGP))
- msg->security |= APPLICATION_PGP;
- else if ((WithCrypto & APPLICATION_SMIME) && option (OPTCRYPTAUTOSMIME)
- && (cur->security & APPLICATION_SMIME))
- msg->security |= APPLICATION_SMIME;
- }
-
- /*
- * No crypto mechanism selected? Use availability + smime_is_default
- * for the decision.
- */
- if (!(msg->security & (APPLICATION_SMIME | APPLICATION_PGP)))
- {
- if ((WithCrypto & APPLICATION_SMIME) && option (OPTCRYPTAUTOSMIME)
- && option (OPTSMIMEISDEFAULT))
- msg->security |= APPLICATION_SMIME;
- else if ((WithCrypto & APPLICATION_PGP) && option (OPTCRYPTAUTOPGP))
- msg->security |= APPLICATION_PGP;
- else if ((WithCrypto & APPLICATION_SMIME) && option (OPTCRYPTAUTOSMIME))
- msg->security |= APPLICATION_SMIME;
- }
- }
-
- /* No permissible mechanisms found. Don't sign or encrypt. */
- if (!(msg->security & (APPLICATION_SMIME|APPLICATION_PGP)))
- msg->security = 0;
}
/*
* don't want to do this when:
* 1) we are sending a key/cert
* 2) we are forwarding a message and the user doesn't want to edit it.
- * This is controled by the quadoption $forward_edit. However, if
+ * This is controlled by the quadoption $forward_edit. However, if
* both $edit_headers and $autoedit are set, we want to ignore the
* setting of $forward_edit because the user probably needs to add the
* recipients.
}
}
+ /*
+ * Set the message security unless:
+ * 1) crypto support is not enabled (WithCrypto==0)
+ * 2) pgp: header field was present during message editing with $edit_headers (msg->security != 0)
+ * 3) we are resending a message
+ * 4) we are recalling a postponed message (don't override the user's saved settings)
+ * 5) we are in mailx mode
+ * 6) we are in batch mode
+ *
+ * This is done after allowing the user to edit the message so that security
+ * settings can be configured with send2-hook and $edit_headers.
+ */
+ if (WithCrypto && (msg->security == 0) && !(flags & (SENDBATCH | SENDMAILX | SENDPOSTPONED | SENDRESEND)))
+ {
+ if (option (OPTCRYPTAUTOSIGN))
+ msg->security |= SIGN;
+ if (option (OPTCRYPTAUTOENCRYPT))
+ msg->security |= ENCRYPT;
+ if (option (OPTCRYPTREPLYENCRYPT) && cur && (cur->security & ENCRYPT))
+ msg->security |= ENCRYPT;
+ if (option (OPTCRYPTREPLYSIGN) && cur && (cur->security & SIGN))
+ msg->security |= SIGN;
+ if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur && (cur->security & ENCRYPT))
+ msg->security |= SIGN;
+ if (WithCrypto & APPLICATION_PGP && (msg->security & (ENCRYPT | SIGN)))
+ {
+ if (option (OPTPGPAUTOINLINE))
+ msg->security |= INLINE;
+ if (option (OPTPGPREPLYINLINE) && cur && (cur->security & INLINE))
+ msg->security |= INLINE;
+ }
+
+ if (msg->security)
+ {
+ /*
+ * When replying / forwarding, use the original message's
+ * crypto system. According to the documentation,
+ * smime_is_default should be disregarded here.
+ *
+ * Problem: At least with forwarding, this doesn't really
+ * make much sense. Should we have an option to completely
+ * disable individual mechanisms at run-time?
+ */
+ if (cur)
+ {
+ if ((WithCrypto & APPLICATION_PGP) && option (OPTCRYPTAUTOPGP)
+ && (cur->security & APPLICATION_PGP))
+ msg->security |= APPLICATION_PGP;
+ else if ((WithCrypto & APPLICATION_SMIME) && option (OPTCRYPTAUTOSMIME)
+ && (cur->security & APPLICATION_SMIME))
+ msg->security |= APPLICATION_SMIME;
+ }
+
+ /*
+ * No crypto mechanism selected? Use availability + smime_is_default
+ * for the decision.
+ */
+ if (!(msg->security & (APPLICATION_SMIME | APPLICATION_PGP)))
+ {
+ if ((WithCrypto & APPLICATION_SMIME) && option (OPTCRYPTAUTOSMIME)
+ && option (OPTSMIMEISDEFAULT))
+ msg->security |= APPLICATION_SMIME;
+ else if ((WithCrypto & APPLICATION_PGP) && option (OPTCRYPTAUTOPGP))
+ msg->security |= APPLICATION_PGP;
+ else if ((WithCrypto & APPLICATION_SMIME) && option (OPTCRYPTAUTOSMIME))
+ msg->security |= APPLICATION_SMIME;
+ }
+ }
+
+ /* No permissible mechanisms found. Don't sign or encrypt. */
+ if (!(msg->security & (APPLICATION_SMIME|APPLICATION_PGP)))
+ msg->security = 0;
+ }
+
/* specify a default fcc. if we are in batchmode, only save a copy of
* the message if the value of $copy is yes or ask-yes */
* the send failed as well so we give the user a chance to fix the
* error.
*/
- if (fcc_error || (i = send_message (msg)) == -1)
+ if (fcc_error || (i = send_message (msg)) < 0)
{
if (!(flags & SENDBATCH))
{
projects / software / mutt-debian.git / blobdiff