X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=8659f21ef1c4d0126c5c4cfe71af59f8601cfc93;hp=f40332028d736397bf40747a120afb5169e2f686;hb=f6e3352d408b7bbbfb46357b6be2c11f9cf95e35;hpb=008170b67979fad71bc48537eeb879f51610275a diff --git a/send.c b/send.c index f403320..8659f21 100644 --- a/send.c +++ b/send.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -24,11 +24,9 @@ #include "attach.h" #ifdef USE_NNTP -#include +#include "nntp.h" #endif -#include "remailer.h" - int url_parse_mailto(ENVELOPE *e, char **body, const char *src) { char *t; @@ -265,18 +263,7 @@ static int edit_envelope (ENVELOPE * en, int flags) return (-1); p_delete(&en->followup_to); en->followup_to = m_strdup(buf); - - if (en->x_comment_to) - m_strcpy(buf, sizeof(buf), en->x_comment_to); - else - buf[0] = 0; - if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO) - && mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0) - return (-1); - p_delete(&en->x_comment_to); - en->x_comment_to = m_strdup(buf); - } - else + } else #endif { if (edit_address (&en->to, "To: ") == -1 || en->to == NULL) @@ -368,9 +355,6 @@ static void process_user_recips (ENVELOPE * env) case MIME_FOLLOWUP_TO: env->followup_to = nntp_get_header(p); break; - case MIME_X_COMMENT_TO: - env->x_comment_to = nntp_get_header(p); - break; #endif default: break; } @@ -409,7 +393,6 @@ static void process_user_header(ENVELOPE * env) #ifdef USE_NNTP case MIME_NEWSGROUPS: case MIME_FOLLOWUP_TO: - case MIME_X_COMMENT_TO: #endif case MIME_SUPERSEDES: case MIME_SUPERCEDES: @@ -660,11 +643,6 @@ void mutt_make_misc_reply_headers (ENVELOPE * env, } else if (!env->subject) env->subject = m_strdup("Re: your mail"); - -#ifdef USE_NNTP - if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from) - env->x_comment_to = m_strdup(mutt_get_name (curenv->from)); -#endif } static string_list_t *mutt_make_references (ENVELOPE * e) @@ -990,14 +968,14 @@ address_t *mutt_default_from (void) if (MAlias.from) adr = address_dup(MAlias.from); - else if (MCore.use_domain) { + else if (mod_core.use_domain) { const char *fqdn = mutt_fqdn (1); adr = address_new(); - adr->mailbox = p_new(char, m_strlen(MCore.username) + m_strlen(fqdn) + 2); - sprintf(adr->mailbox, "%s@%s", NONULL(MCore.username), NONULL(fqdn)); + adr->mailbox = p_new(char, m_strlen(mod_core.username) + m_strlen(fqdn) + 2); + sprintf(adr->mailbox, "%s@%s", NONULL(mod_core.username), NONULL(fqdn)); } else { adr = address_new (); - adr->mailbox = m_strdup(NONULL(MCore.username)); + adr->mailbox = m_strdup(NONULL(mod_core.username)); } return (adr); @@ -1010,12 +988,11 @@ static int send_message (HEADER * msg) int i; /* Write out the message in MIME form. */ - tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL); + tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL); if (!tempfp) return -1; - mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, - msg->chain ? 1 : 0); + mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0); fputc ('\n', tempfp); /* tie off the header. */ if ((mutt_write_mime_body (msg->content, tempfp) == -1)) { @@ -1030,9 +1007,6 @@ static int send_message (HEADER * msg) return (-1); } - if (msg->chain) - return mix_send_message (msg->chain, tempfile); - i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc, msg->env->bcc, tempfile, (msg->content->encoding == ENC8BIT)); @@ -1208,7 +1182,7 @@ int ci_send_message (int flags, /* send mode */ if (!tempfile) { char buffer[_POSIX_PATH_MAX]; - tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL); + tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(mod_core.tmpdir), NULL); msg->content->filename = m_strdup(buffer); } else { tempfp = safe_fopen(tempfile, "a+"); @@ -1244,10 +1218,8 @@ int ci_send_message (int flags, /* send mode */ if (flags & SENDBATCH) { mutt_copy_stream (stdin, tempfp); - if (option (OPTHDRS)) { - process_user_recips (msg->env); - process_user_header (msg->env); - } + process_user_recips (msg->env); + process_user_header (msg->env); mutt_expand_aliases_env (msg->env); } else if (!(flags & (SENDPOSTPONED | SENDRESEND))) { @@ -1255,8 +1227,7 @@ int ci_send_message (int flags, /* send mode */ envelope_defaults (msg->env, ctx, cur, flags) == -1) goto cleanup; - if (option (OPTHDRS)) - process_user_recips (msg->env); + process_user_recips (msg->env); /* Expand aliases and remove duplicates/crossrefs */ mutt_fix_reply_recipients (msg->env); @@ -1264,7 +1235,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 = m_strdup(((NNTP_DATA *) ctx->data)->group); + msg->env->newsgroups = m_strdup(((nntp_data_t *)ctx->data)->group); #endif if (!(option (OPTAUTOEDIT) && option (OPTEDITHDRS)) && @@ -1312,8 +1283,7 @@ int ci_send_message (int flags, /* send mode */ killfrom = 0; } - if (option (OPTHDRS)) - process_user_header (msg->env); + process_user_header (msg->env); /* include replies/forwarded messages, unless we are given a template */ if (!tempfile && (ctx || !(flags & (SENDREPLY | SENDFORWARD))) @@ -1327,16 +1297,15 @@ int ci_send_message (int flags, /* send mode */ * can take effect. */ - if (option (OPTCRYPTAUTOSIGN)) + if (mod_crypt.autosign) msg->security |= SIGN; - if (option (OPTCRYPTAUTOENCRYPT)) + if (mod_crypt.autoencrypt) msg->security |= ENCRYPT; - if (option (OPTCRYPTREPLYENCRYPT) && cur && (cur->security & ENCRYPT)) + if (mod_crypt.replyencrypt && cur && (cur->security & ENCRYPT)) msg->security |= ENCRYPT; - if (option (OPTCRYPTREPLYSIGN) && cur && (cur->security & SIGN)) + if (mod_crypt.replysign && cur && (cur->security & SIGN)) msg->security |= SIGN; - if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur - && (cur->security & ENCRYPT)) + if (mod_crypt.replysignencrypted && cur && (cur->security & ENCRYPT)) msg->security |= SIGN; if (msg->security) { @@ -1350,10 +1319,9 @@ int ci_send_message (int flags, /* send mode */ * disable individual mechanisms at run-time? */ if (cur) { - if (option (OPTCRYPTAUTOPGP) && (cur->security & APPLICATION_PGP)) + if (mod_crypt.autopgp && (cur->security & APPLICATION_PGP)) msg->security |= APPLICATION_PGP; - else if (option (OPTCRYPTAUTOSMIME) - && (cur->security & APPLICATION_SMIME)) + else if (mod_crypt.autosmime && (cur->security & APPLICATION_SMIME)) msg->security |= APPLICATION_SMIME; } @@ -1362,11 +1330,11 @@ int ci_send_message (int flags, /* send mode */ * for the decision. */ if (!(msg->security & (APPLICATION_SMIME | APPLICATION_PGP))) { - if (option (OPTCRYPTAUTOSMIME) && option (OPTSMIMEISDEFAULT)) + if (mod_crypt.autosmime && mod_crypt.smime_is_default) msg->security |= APPLICATION_SMIME; - else if (option (OPTCRYPTAUTOPGP)) + else if (mod_crypt.autopgp) msg->security |= APPLICATION_PGP; - else if (option (OPTCRYPTAUTOSMIME)) + else if (mod_crypt.autosmime) msg->security |= APPLICATION_SMIME; } }