#include "keymap.h"
#include "copy.h"
#include "mx.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
#include "mutt_idna.h"
#include "url.h"
#include "attach.h"
return (-1);
}
- str_replace (&en->subject, buf);
+ m_strreplace(&en->subject, buf);
return 0;
}
env->reply_to = rfc822_parse_adrlist (env->reply_to, uh->data + 9);
}
else if (ascii_strncasecmp ("message-id:", uh->data, 11) == 0)
- str_replace (&env->message_id, uh->data + 11);
+ m_strreplace(&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 &&
mutt_parse_mime_message (ctx, cur);
mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
- if (WithCrypto && (cur->security & ENCRYPT) && option (OPTFORWDECODE)) {
+ if ((cur->security & ENCRYPT) && option (OPTFORWDECODE)) {
/* make sure we have the user's passphrase before proceeding... */
crypt_valid_passphrase (cur->security);
}
int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV | M_CM_REPLYING;
int chflags = CH_DECODE;
- if (WithCrypto && (cur->security & ENCRYPT)) {
+ if ((cur->security & ENCRYPT)) {
/* make sure we have the user's passphrase before proceeding... */
crypt_valid_passphrase (cur->security);
}
/* set the default subject for the message. */
mutt_make_string (buffer, sizeof (buffer), NONULL (ForwFmt), ctx, cur);
- str_replace (&env->subject, buffer);
+ m_strreplace(&env->subject, buffer);
}
void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
else if (i == -1)
return -1;
}
- /* if (WithCrypto && (flags & SENDKEY)) */
- else if ((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)) {
+ else if (flags & SENDKEY) {
BODY *tmp;
- if ((WithCrypto & APPLICATION_PGP)
- && (tmp = crypt_pgp_make_key_attachment (NULL)) == NULL)
+ if ((tmp = crypt_pgp_make_key_attachment (NULL)) == NULL)
return -1;
tmp->next = msg->content;
int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur)
{
- HEADER *msg = mutt_new_header ();
+ HEADER *msg = header_new();
if (mutt_prepare_template (fp, ctx, msg, cur, 1) < 0)
return -1;
}
- if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED))
+ if (flags & SENDPOSTPONED)
signas = m_strdup(PgpSignAs);
/* Delay expansion of aliases until absolutely necessary--shouldn't
*/
if (!msg) {
- msg = mutt_new_header ();
+ msg = header_new();
if (flags == SENDPOSTPONED) {
if ((flags =
}
if (!msg->env)
- msg->env = mutt_new_envelope ();
+ msg->env = envelope_new();
}
/* Parse and use an eventual list-post header */
msg->env->newsgroups = m_strdup(((NNTP_DATA *) ctx->data)->group);
#endif
- if (!(flags & SENDMAILX) &&
- !(option (OPTAUTOEDIT) && option (OPTEDITHDRS)) &&
+ if (!(option (OPTAUTOEDIT) && option (OPTEDITHDRS)) &&
!((flags & SENDREPLY) && option (OPTFASTREPLY))) {
if (edit_envelope (msg->env, flags) == -1)
goto cleanup;
process_user_header (msg->env);
- if (option (OPTSIGONTOP)
- && (!(flags & (SENDMAILX | SENDKEY)) && Editor
- && m_strcmp(Editor, "builtin") != 0))
+ if (option (OPTSIGONTOP) && (!(flags & SENDKEY) && Editor))
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
- && m_strcmp(Editor, "builtin") != 0))
+ if (!option (OPTSIGONTOP) && (!(flags & SENDKEY) && Editor))
append_signature (tempfp);
/*
* 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 (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 (msg->security & (ENCRYPT | SIGN)) {
+ if (option (OPTPGPAUTOINLINE))
+ msg->security |= INLINE;
+ if (option (OPTPGPREPLYINLINE) && cur && (cur->security & INLINE))
+ msg->security |= INLINE;
}
- if (WithCrypto && msg->security) {
+ if (msg->security) {
/*
* When reypling / forwarding, use the original message's
* crypto system. According to the documentation,
* disable individual mechanisms at run-time?
*/
if (cur) {
- if ((WithCrypto & APPLICATION_PGP) && option (OPTCRYPTAUTOPGP)
- && (cur->security & APPLICATION_PGP))
+ if (option (OPTCRYPTAUTOPGP) && (cur->security & APPLICATION_PGP))
msg->security |= APPLICATION_PGP;
- else if ((WithCrypto & APPLICATION_SMIME)
- && option (OPTCRYPTAUTOSMIME)
+ else if (option (OPTCRYPTAUTOSMIME)
&& (cur->security & APPLICATION_SMIME))
msg->security |= APPLICATION_SMIME;
}
* for the decision.
*/
if (!(msg->security & (APPLICATION_SMIME | APPLICATION_PGP))) {
- if ((WithCrypto & APPLICATION_SMIME) && option (OPTCRYPTAUTOSMIME)
- && option (OPTSMIMEISDEFAULT))
+ if (option (OPTCRYPTAUTOSMIME) && option (OPTSMIMEISDEFAULT))
msg->security |= APPLICATION_SMIME;
- else if ((WithCrypto & APPLICATION_PGP) && option (OPTCRYPTAUTOPGP))
+ else if (option (OPTCRYPTAUTOPGP))
msg->security |= APPLICATION_PGP;
- else if ((WithCrypto & APPLICATION_SMIME)
- && option (OPTCRYPTAUTOSMIME))
+ else if (option (OPTCRYPTAUTOSMIME))
msg->security |= APPLICATION_SMIME;
}
}
&& !(flags & (SENDRESEND | SENDPOSTPONED)))
msg->env->from->personal = m_strdup(Realname);
- if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)))
+ if (!(flags & SENDKEY))
safe_fclose (&tempfp);
- if (flags & SENDMAILX) {
- if (mutt_builtin_editor (msg->content->filename, msg, cur) == -1)
- goto cleanup;
- }
- else if (!(flags & SENDBATCH)) {
+ if (!(flags & SENDBATCH)) {
struct stat st;
time_t mtime = mutt_decrease_mtime (msg->content->filename, NULL);
if (mutt_needs_mailcap (msg->content)) {
if (!mutt_edit_attachment (msg->content))
goto cleanup;
- } else if (!Editor || m_strcmp("builtin", Editor) == 0)
- mutt_builtin_editor (msg->content->filename, msg, cur);
- else if (option (OPTEDITHDRS)) {
+ } else if (option (OPTEDITHDRS)) {
mutt_env_to_local (msg->env);
mutt_edit_headers (Editor, msg->content->filename, msg, fcc,
sizeof (fcc));
mutt_update_encoding (msg->content);
- if (!(flags & (SENDMAILX | SENDBATCH))) {
+ if (!(flags & SENDBATCH)) {
main_loop:
fcc_error = 0; /* reset value since we may have failed before */
clear_content = NULL;
free_clear_content = 0;
- if (WithCrypto) {
- if (msg->security) {
- /* save the decrypted attachments */
- clear_content = msg->content;
+ if (msg->security) {
+ /* save the decrypted attachments */
+ clear_content = msg->content;
- if ((crypt_get_keys (msg, &pgpkeylist) == -1) ||
- mutt_protect (msg, pgpkeylist) == -1) {
- msg->content = mutt_remove_multipart (msg->content);
+ if ((crypt_get_keys (msg, &pgpkeylist) == -1) ||
+ mutt_protect (msg, pgpkeylist) == -1) {
+ msg->content = mutt_remove_multipart (msg->content);
- p_delete(&pgpkeylist);
+ p_delete(&pgpkeylist);
- decode_descriptions (msg->content);
- goto main_loop;
- }
- encode_descriptions (msg->content, 0);
+ decode_descriptions (msg->content);
+ goto main_loop;
}
+ encode_descriptions (msg->content, 0);
+ }
- /*
- * at this point, msg->content is one of the following three things:
- * - multipart/signed. In this case, clear_content is a child.
- * - multipart/encrypted. In this case, clear_content exists
- * independently
- * - application/pgp. In this case, clear_content exists independently.
- * - something else. In this case, it's the same as clear_content.
- */
+ /*
+ * at this point, msg->content is one of the following three things:
+ * - multipart/signed. In this case, clear_content is a child.
+ * - multipart/encrypted. In this case, clear_content exists
+ * independently
+ * - application/pgp. In this case, clear_content exists independently.
+ * - something else. In this case, it's the same as clear_content.
+ */
- /* This is ugly -- lack of "reporting back" from mutt_protect(). */
+ /* This is ugly -- lack of "reporting back" from mutt_protect(). */
- if (clear_content && (msg->content != clear_content)
- && (msg->content->parts != clear_content))
- free_clear_content = 1;
- }
+ if (clear_content && (msg->content != clear_content)
+ && (msg->content->parts != clear_content))
+ free_clear_content = 1;
- if (!option (OPTNOCURSES) && !(flags & SENDMAILX))
+ if (!option (OPTNOCURSES))
mutt_message _("Sending message...");
mutt_prepare_envelope (msg->env, 1);
* I'd like to think a bit more about this before including it.
*/
-#ifdef USE_IMAP
if ((flags & SENDBATCH) && fcc[0] && mx_get_magic (fcc) == M_IMAP)
fcc[0] = '\0';
-#endif
if (*fcc && m_strcmp("/dev/null", fcc) != 0) {
BODY *tmpbody = msg->content;
BODY *save_sig = NULL;
BODY *save_parts = NULL;
- if (WithCrypto && msg->security && option (OPTFCCCLEAR))
+ if (msg->security && option (OPTFCCCLEAR))
msg->content = clear_content;
/* check to see if the user wants copies of all attachments */
if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART) {
- if (WithCrypto
- && (m_strcmp(msg->content->subtype, "encrypted") == 0 ||
- m_strcmp(msg->content->subtype, "signed") == 0)) {
+ if ((m_strcmp(msg->content->subtype, "encrypted") == 0 ||
+ m_strcmp(msg->content->subtype, "signed") == 0))
+ {
if (clear_content->type == TYPEMULTIPART) {
if (!(msg->security & ENCRYPT) && (msg->security & SIGN)) {
/* save initial signature and attachments */
msg->content = tmpbody;
- if (WithCrypto && save_sig) {
+ if (save_sig) {
/* cleanup the second signature structures */
if (save_content->parts) {
mutt_free_body (&save_content->parts->next);
msg->content->parts->next = save_sig;
msg->content->parts->parts->next = save_parts;
}
- else if (WithCrypto && save_content) {
+ else if (save_content) {
/* destroy the new encrypted body. */
mutt_free_body (&save_content);
}
*/
if (fcc_error || (i = send_message (msg)) == -1) {
if (!(flags & SENDBATCH)) {
- if (!WithCrypto);
- else if ((msg->security & ENCRYPT) || ((msg->security & SIGN)
- && msg->content->type ==
- TYPEAPPLICATION)) {
+ if ((msg->security & ENCRYPT)
+ || ((msg->security & SIGN)
+ && msg->content->type == TYPEAPPLICATION)) {
mutt_free_body (&msg->content); /* destroy PGP data */
msg->content = clear_content; /* restore clear text. */
}
goto cleanup;
}
}
- else if (!option (OPTNOCURSES) && !(flags & SENDMAILX))
+ else if (!option (OPTNOCURSES))
mutt_message (i != 0 ? _("Sending in background.") :
#ifdef USE_NNTP
(flags & SENDNEWS) ? _("Article posted.") :
- _("Mail sent."));
+ _("Mail sent.")
#else
- _("Mail sent."));
+ _("Mail sent.")
#endif
-
- if (WithCrypto && (msg->security & ENCRYPT))
+ );
+ if (msg->security & ENCRYPT)
p_delete(&pgpkeylist);
- if (WithCrypto && free_clear_content)
+ if (free_clear_content)
mutt_free_body (&clear_content);
if (flags & SENDREPLY) {
cleanup:
- if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) {
+ if (flags & SENDPOSTPONED) {
if (signas) {
p_delete(&PgpSignAs);
PgpSignAs = signas;
}
safe_fclose (&tempfp);
- mutt_free_header (&msg);
+ header_delete(&msg);
return rv;
}