X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=e40d3daf0edc0a2ed5707e6fc07106fe8cb4b403;hp=bbebca3b53e5ffa95260d4369a284deaf632f0bd;hb=91acd32003fb8eb9b3b05b35c1aa32a6c07aad43;hpb=711f787502b6a1a1c150b948a5ed9156c8ef9ba1 diff --git a/send.c b/send.c index bbebca3..e40d3da 100644 --- a/send.c +++ b/send.c @@ -7,54 +7,87 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include #include - +#include +#include #include #include +#include -#include "mutt.h" #include "alias.h" -#include "rfc3676.h" #include "keymap.h" #include "copy.h" -#include "mx.h" -#include +#include "crypt.h" #include "mutt_idna.h" #include "attach.h" #ifdef USE_NNTP -#include "nntp.h" +#include #endif -#ifdef MIXMASTER #include "remailer.h" -#endif +int url_parse_mailto(ENVELOPE *e, char **body, const char *src) +{ + char *t; + char *tmp; + char *headers; + char *tag, *value; + char scratch[HUGE_STRING]; + + int taglen; + + string_list_t **last = &e->userhdrs; + + if (!(t = strchr (src, ':'))) + return -1; + + if ((tmp = m_strdup(t + 1)) == NULL) + return -1; + + if ((headers = strchr (tmp, '?'))) + *headers++ = '\0'; + + url_decode(tmp); + e->to = rfc822_parse_adrlist(e->to, tmp); + + tag = headers ? strtok (headers, "&") : NULL; + + for (; tag; tag = strtok(NULL, "&")) { + if ((value = strchr (tag, '='))) + *value++ = '\0'; + if (!value || !*value) + continue; + + url_decode (tag); + url_decode (value); + + if (mime_which_token(tag, -1) == MIME_BODY) { + if (body) + m_strreplace(body, value); + } else { +#define SAFEPFX (option(OPTSTRICTMAILTO) ? "" : "X-Mailto-") + taglen = m_strlen(tag) + strlen(SAFEPFX); + /* mutt_parse_rfc822_line makes some assumptions */ + snprintf(scratch, sizeof(scratch), "%s%s: %s", SAFEPFX, tag, value); +#undef SAVEPFX + scratch[taglen] = '\0'; + value = vskipspaces(&scratch[taglen + 1]); + last = mutt_parse_rfc822_line (e, NULL, scratch, value, 0, 0, last); + /* if $strict_mailto is set, force editing headers to let + * users have a look at what we got */ + if (!option (OPTSTRICTMAILTO)) { + set_option (OPTXMAILTO); + set_option (OPTEDITHDRS); + } + } + } + p_delete(&tmp); + return 0; +} static void append_signature (FILE * f) { FILE *tmpfp; @@ -64,13 +97,13 @@ static void append_signature (FILE * f) fprintf (f, "\n%s", SignOffString); } - if (Signature && (tmpfp = mutt_open_read (Signature, &thepid))) { + if ((tmpfp = mutt_open_read(NONULL(MAlias.signature), &thepid))) { if (option (OPTSIGDASHES)) fputs ("\n-- \n", f); else if (SignOffString) fputs ("\n", f); mutt_copy_stream (tmpfp, f); - fclose (tmpfp); + m_fclose(&tmpfp); if (thepid != -1) mutt_wait_filter (thepid); } @@ -184,13 +217,13 @@ static address_t *find_mailing_lists (address_t * t, address_t * c) static int edit_address (address_t ** a, const char *field) { char buf[HUGE_STRING]; - const char *err = NULL; + char *err = NULL; int idna_ok = 0; do { buf[0] = 0; mutt_addrlist_to_local (*a); - rfc822_write_address (buf, sizeof (buf), *a, 0); + rfc822_addrcat(buf, sizeof(buf), *a, 0); if (mutt_get_field (field, buf, sizeof (buf), M_ALIAS) != 0) return (-1); address_list_wipe(a); @@ -303,7 +336,7 @@ static int edit_envelope (ENVELOPE * en, int flags) } #ifdef USE_NNTP -char *nntp_get_header(const char *s) +static char *nntp_get_header(const char *s) { return m_strdup(skipspaces(s)); } @@ -311,66 +344,85 @@ char *nntp_get_header(const char *s) static void process_user_recips (ENVELOPE * env) { - string_list_t *uh = UserHeader; + string_list_t *uh = UserHeader; - for (; uh; uh = uh->next) { - if (ascii_strncasecmp ("to:", uh->data, 3) == 0) - env->to = rfc822_parse_adrlist (env->to, uh->data + 3); - else if (ascii_strncasecmp ("cc:", uh->data, 3) == 0) - env->cc = rfc822_parse_adrlist (env->cc, uh->data + 3); - else if (ascii_strncasecmp ("bcc:", uh->data, 4) == 0) - env->bcc = rfc822_parse_adrlist (env->bcc, uh->data + 4); + for (; uh; uh = uh->next) { + const char *p = strchr(uh->data, ':'); + if (!p) + continue; + + switch (mime_which_token(uh->data, p++ - uh->data)) { + case MIME_TO: + env->to = rfc822_parse_adrlist(env->to, p); + break; + case MIME_CC: + env->cc = rfc822_parse_adrlist(env->cc, p); + break; + case MIME_BCC: + env->bcc = rfc822_parse_adrlist(env->bcc, p); + break; #ifdef USE_NNTP - else if (ascii_strncasecmp ("newsgroups:", uh->data, 11) == 0) - env->newsgroups = nntp_get_header (uh->data + 11); - else if (ascii_strncasecmp ("followup-to:", uh->data, 12) == 0) - env->followup_to = nntp_get_header (uh->data + 12); - else if (ascii_strncasecmp ("x-comment-to:", uh->data, 13) == 0) - env->x_comment_to = nntp_get_header (uh->data + 13); + case MIME_NEWSGROUPS: + env->newsgroups = nntp_get_header(p); + break; + 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; + } + } } -static void process_user_header (ENVELOPE * env) +static void process_user_header(ENVELOPE * env) { - string_list_t *uh = UserHeader; - string_list_t *last = env->userhdrs; - - if (last) - while (last->next) - last = last->next; - - for (; uh; uh = uh->next) { - if (ascii_strncasecmp ("from:", uh->data, 5) == 0) { - /* User has specified a default From: address. Remove default address */ - address_list_wipe(&env->from); - env->from = rfc822_parse_adrlist (env->from, uh->data + 5); - } - else if (ascii_strncasecmp ("reply-to:", uh->data, 9) == 0) { - address_list_wipe(&env->reply_to); - env->reply_to = rfc822_parse_adrlist (env->reply_to, uh->data + 9); - } - else if (ascii_strncasecmp ("message-id:", uh->data, 11) == 0) - 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 && + string_list_t *uh; + string_list_t **last = string_list_last(&env->userhdrs); + + for (uh = UserHeader; uh; uh = uh->next) { + const char *p = strchr(uh->data, ':'); + if (!p) + continue; + + switch (mime_which_token(uh->data, p++ - uh->data)) { + case MIME_FROM: + /* User has specified a default From: address. Remove default address */ + address_list_wipe(&env->from); + env->from = rfc822_parse_adrlist(env->from, p); + break; + + case MIME_REPLY_TO: + address_list_wipe(&env->reply_to); + env->reply_to = rfc822_parse_adrlist (env->reply_to, p); + break; + + case MIME_MESSAGE_ID: + m_strreplace(&env->message_id, p); + break; + + case MIME_TO: + case MIME_CC: + case MIME_BCC: #ifdef USE_NNTP - ascii_strncasecmp ("newsgroups:", uh->data, 11) != 0 && - ascii_strncasecmp ("followup-to:", uh->data, 12) != 0 && - ascii_strncasecmp ("x-comment-to:", uh->data, 13) != 0 && + case MIME_NEWSGROUPS: + case MIME_FOLLOWUP_TO: + case MIME_X_COMMENT_TO: #endif - ascii_strncasecmp ("supersedes:", uh->data, 11) != 0 && - ascii_strncasecmp ("subject:", uh->data, 8) != 0) { - if (last) { - last->next = string_item_new(); - last = last->next; - } - else - last = env->userhdrs = string_item_new(); - last->data = m_strdup(uh->data); + case MIME_SUPERSEDES: + case MIME_SUPERCEDES: + case MIME_SUBJECT: + break; + + default: + *last = string_item_new(); + (*last)->data = m_strdup(uh->data); + last = &(*last)->next; + break; + } } - } } void mutt_forward_intro (FILE * fp, HEADER * cur) @@ -379,7 +431,7 @@ void mutt_forward_intro (FILE * fp, HEADER * cur) fputs ("----- Forwarded message from ", fp); buffer[0] = 0; - rfc822_write_address (buffer, sizeof (buffer), cur->env->from, 1); + rfc822_addrcat(buffer, sizeof(buffer), cur->env->from, 1); fputs (buffer, fp); fputs (" -----\n\n", fp); } @@ -397,11 +449,6 @@ static int include_forward (CONTEXT * ctx, HEADER * cur, FILE * out) mutt_parse_mime_message (ctx, cur); mutt_message_hook (ctx, cur, M_MESSAGEHOOK); - if ((cur->security & ENCRYPT) && option (OPTFORWDECODE)) { - /* make sure we have the user's passphrase before proceeding... */ - crypt_valid_passphrase (cur->security); - } - mutt_forward_intro (out, cur); if (option (OPTFORWDECODE)) { @@ -430,30 +477,13 @@ void mutt_make_attribution (CONTEXT * ctx, HEADER * cur, FILE * out) } } -void mutt_make_post_indent (CONTEXT * ctx, HEADER * cur, FILE * out) -{ - char buffer[STRING]; - - if (PostIndentString) { - mutt_make_string (buffer, sizeof (buffer), PostIndentString, ctx, cur); - fputs (buffer, out); - fputc ('\n', out); - } -} - static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out) { int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV | M_CM_REPLYING; int chflags = CH_DECODE; - if ((cur->security & ENCRYPT)) { - /* make sure we have the user's passphrase before proceeding... */ - crypt_valid_passphrase (cur->security); - } - mutt_parse_mime_message (ctx, cur); mutt_message_hook (ctx, cur, M_MESSAGEHOOK); - mutt_make_attribution (ctx, cur, out); if (!option (OPTHEADER)) @@ -464,9 +494,6 @@ static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out) } mutt_copy_message (out, ctx, cur, cmflags, chflags); - - mutt_make_post_indent (ctx, cur, out); - return 0; } @@ -586,25 +613,6 @@ int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags) return 0; } -string_list_t *mutt_make_references (ENVELOPE * e) -{ - string_list_t *t = NULL, *l = NULL; - - if (e->references) - l = string_list_dup(e->references); - else - l = string_list_dup(e->in_reply_to); - - if (e->message_id) { - t = string_item_new(); - t->data = m_strdup(e->message_id); - t->next = l; - l = t; - } - - return l; -} - void mutt_fix_reply_recipients (ENVELOPE * env) { mutt_expand_aliases_env (env); @@ -618,8 +626,8 @@ void mutt_fix_reply_recipients (ENVELOPE * env) } /* the CC field can get cluttered, especially with lists */ - env->to = mutt_remove_duplicates (env->to); - env->cc = mutt_remove_duplicates (env->cc); + address_list_uniq(env->to); + address_list_uniq(env->cc); env->cc = mutt_remove_xrefs (env->to, env->cc); if (env->cc && !env->to) { @@ -637,8 +645,10 @@ void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur) m_strreplace(&env->subject, buffer); } -void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx, - HEADER * cur, ENVELOPE * curenv) +void mutt_make_misc_reply_headers (ENVELOPE * env, + CONTEXT * ctx __attribute__ ((unused)), + HEADER * cur __attribute__ ((unused)), + ENVELOPE * curenv) { /* This takes precedence over a subject that might have * been taken from a List-Post header. Is that correct? @@ -646,7 +656,7 @@ void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx, if (curenv->real_subj) { p_delete(&env->subject); env->subject = p_new(char, m_strlen(curenv->real_subj) + 5); - sprintf (env->subject, "Re: %s", curenv->real_subj); /* __SPRINTF_CHECKED__ */ + sprintf (env->subject, "Re: %s", curenv->real_subj); } else if (!env->subject) env->subject = m_strdup("Re: your mail"); @@ -657,6 +667,25 @@ void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx, #endif } +static string_list_t *mutt_make_references (ENVELOPE * e) +{ + string_list_t *t = NULL, *l = NULL; + + if (e->references) + l = string_list_dup(e->references); + else + l = string_list_dup(e->in_reply_to); + + if (e->message_id) { + t = string_item_new(); + t->data = m_strdup(e->message_id); + t->next = l; + l = t; + } + + return l; +} + void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv, string_list_t *** pp, string_list_t *** qq) { @@ -856,15 +885,6 @@ static int generate_body (FILE * tempfp, /* stream for outgoing message * else if (i == -1) return -1; } - else if (flags & SENDKEY) { - BODY *tmp; - - if ((tmp = crypt_pgp_make_key_attachment (NULL)) == NULL) - return -1; - - tmp->next = msg->content; - msg->content = tmp; - } mutt_clear_error (); @@ -873,62 +893,59 @@ static int generate_body (FILE * tempfp, /* stream for outgoing message * void mutt_set_followup_to (ENVELOPE * e) { - address_t *from; - - /* - * Only generate the Mail-Followup-To if the user has requested it, and - * it hasn't already been set - */ + /* + * Only generate the Mail-Followup-To if the user has requested it, and + * it hasn't already been set + */ + if (!option(OPTFOLLOWUPTO)) + return; - if (!option (OPTFOLLOWUPTO)) - return; #ifdef USE_NNTP - if (option (OPTNEWSSEND)) { - if (!e->followup_to && e->newsgroups && (strrchr (e->newsgroups, ','))) - e->followup_to = m_strdup(e->newsgroups); - return; - } + if (option(OPTNEWSSEND)) { + if (!e->followup_to && e->newsgroups && strrchr(e->newsgroups, ',')) + e->followup_to = m_strdup(e->newsgroups); + return; + } #endif - if (!e->mail_followup_to) { + if (e->mail_followup_to) + return; + if (mutt_is_list_cc (0, e->to, e->cc)) { - address_t **tmp; - /* - * this message goes to known mailing lists, so create a proper - * mail-followup-to header - */ + address_t **tmp; - tmp = address_list_append(&e->mail_followup_to, address_list_dup(e->to)); - address_list_append(tmp, address_list_dup(e->cc)); + /* + * this message goes to known mailing lists, so create a proper + * mail-followup-to header + */ + tmp = address_list_append(&e->mail_followup_to, address_list_dup(e->to)); + address_list_append(tmp, address_list_dup(e->cc)); } /* remove ourselves from the mail-followup-to header */ - e->mail_followup_to = remove_user (e->mail_followup_to, 0); + e->mail_followup_to = remove_user(e->mail_followup_to, 0); /* * If we are not subscribed to any of the lists in question, - * re-add ourselves to the mail-followup-to header. The + * re-add ourselves to the mail-followup-to header. The * mail-followup-to header generated is a no-op with group-reply, * but makes sure list-reply has the desired effect. */ + if (e->mail_followup_to && !mutt_is_list_recipient(0, e->to, e->cc)) { + address_t *from; - if (e->mail_followup_to && !mutt_is_list_recipient (0, e->to, e->cc)) { - if (e->reply_to) - from = address_list_dup (e->reply_to); - else if (e->from) - from = address_list_dup (e->from); - else - from = mutt_default_from (); + if (e->reply_to) + from = address_list_dup(e->reply_to); + else if (e->from) + from = address_list_dup(e->from); + else + from = mutt_default_from(); - if (from) { - address_list_append(&from->next, e->mail_followup_to); + address_list_append(&from, e->mail_followup_to); e->mail_followup_to = from; - } } - e->mail_followup_to = mutt_remove_duplicates(e->mail_followup_to); - - } + address_list_uniq(e->mail_followup_to); } @@ -937,50 +954,50 @@ void mutt_set_followup_to (ENVELOPE * e) from field */ static address_t *set_reverse_name (ENVELOPE * env) { - address_t *tmp; + address_t *tmp = NULL; - for (tmp = env->to; tmp; tmp = tmp->next) { - if (mutt_addr_is_user (tmp)) - break; - } - if (!tmp) { + for (tmp = env->to; tmp; tmp = tmp->next) { + if (mutt_addr_is_user(tmp)) + goto found; + } for (tmp = env->cc; tmp; tmp = tmp->next) { - if (mutt_addr_is_user (tmp)) - break; + if (mutt_addr_is_user(tmp)) + goto found; } - } - if (!tmp && mutt_addr_is_user (env->from)) + + if (!mutt_addr_is_user(env->from)) + return NULL; + tmp = env->from; - if (tmp) { - tmp = address_dup (tmp); - if (!option (OPTREVREAL)) - p_delete(&tmp->personal); - if (!tmp->personal) - tmp->personal = m_strdup(Realname); - } - return (tmp); + + found: + tmp = address_dup(tmp); + if (!option(OPTREVREAL) || !tmp->personal) { + p_delete(&tmp->personal); + tmp->personal = m_strdup(Realname); + } + return tmp; } address_t *mutt_default_from (void) { address_t *adr; - const char *fqdn = mutt_fqdn (1); - /* - * Note: We let $from override $realname here. Is this the right - * thing to do? + /* + * Note: We let $from override $realname here. + * Is this the right thing to do? */ - if (From) - adr = address_dup (From); - else if (option (OPTUSEDOMAIN)) { + if (MAlias.from) + adr = address_dup(MAlias.from); + else if (MCore.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)); + } else { adr = address_new (); - adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2); - sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */ - } - else { - adr = address_new (); - adr->mailbox = m_strdup(NONULL (Username)); + adr->mailbox = m_strdup(NONULL(MCore.username)); } return (adr); @@ -993,36 +1010,28 @@ static int send_message (HEADER * msg) int i; /* Write out the message in MIME form. */ - mutt_mktemp (tempfile); - if ((tempfp = safe_fopen (tempfile, "w")) == NULL) - return (-1); + tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL); + if (!tempfp) + return -1; -#ifdef MIXMASTER mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, msg->chain ? 1 : 0); -#endif -#ifndef MIXMASTER - mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, 0); -#endif - fputc ('\n', tempfp); /* tie off the header. */ if ((mutt_write_mime_body (msg->content, tempfp) == -1)) { - fclose (tempfp); + m_fclose(&tempfp); unlink (tempfile); return (-1); } - if (fclose (tempfp) != 0) { - mutt_perror (tempfile); + if (m_fclose(&tempfp) != 0) { + mutt_perror (_("Can't create temporary file")); unlink (tempfile); return (-1); } -#ifdef MIXMASTER if (msg->chain) return mix_send_message (msg->chain, tempfile); -#endif i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc, msg->env->bcc, tempfile, @@ -1068,14 +1077,14 @@ static void fix_end_of_file (const char *data) fseeko (fp, -1, SEEK_END); if ((c = fgetc (fp)) != '\n') fputc ('\n', fp); - safe_fclose (&fp); + m_fclose(&fp); } int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur) { HEADER *msg = header_new(); - if (mutt_prepare_template (fp, ctx, msg, cur, 1) < 0) + if (mutt_prepare_template (fp, ctx, msg, cur, option(OPTWEED)) < 0) return -1; return ci_send_message (SENDRESEND, msg, NULL, ctx, cur); @@ -1087,7 +1096,6 @@ int ci_send_message (int flags, /* send mode */ CONTEXT * ctx, /* current mailbox */ HEADER * cur) { /* current message */ - char buffer[LONG_STRING]; char fcc[_POSIX_PATH_MAX] = ""; /* where to copy this message */ FILE *tempfp = NULL; BODY *pbody; @@ -1100,8 +1108,8 @@ int ci_send_message (int flags, /* send mode */ char *pgpkeylist = NULL; /* save current value of "pgp_sign_as" */ - char *signas = NULL; - const char *tag = NULL, *err = NULL; + char *signas = NULL, *err = NULL; + const char *tag = NULL; char *ctype; int rv = -1; @@ -1178,8 +1186,8 @@ int ci_send_message (int flags, /* send mode */ address_list_wipe(&msg->env->from); } - if (!(flags & (SENDKEY | SENDPOSTPONED | SENDRESEND))) { - pbody = mutt_new_body (); + if (!(flags & (SENDPOSTPONED | SENDRESEND))) { + pbody = body_new(); pbody->next = msg->content; /* don't kill command-line attachments */ msg->content = pbody; @@ -1193,24 +1201,21 @@ int ci_send_message (int flags, /* send mode */ msg->content->disposition = DISPINLINE; if (option (OPTTEXTFLOWED) && msg->content->type == TYPETEXT && !ascii_strcasecmp (msg->content->subtype, "plain")) { - mutt_set_parameter ("format", "flowed", &msg->content->parameter); + parameter_setval(&msg->content->parameter, "format", "flowed"); if (option (OPTDELSP)) - mutt_set_parameter ("delsp", "yes", &msg->content->parameter); + parameter_setval(&msg->content->parameter, "delsp", "yes"); } if (!tempfile) { - mutt_mktemp (buffer); - tempfp = safe_fopen (buffer, "w+"); + char buffer[_POSIX_PATH_MAX]; + tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL); msg->content->filename = m_strdup(buffer); - } - else { - tempfp = safe_fopen (tempfile, "a+"); + } else { + tempfp = safe_fopen(tempfile, "a+"); msg->content->filename = m_strdup(tempfile); } if (!tempfp) { - debug_print (1, ("can't create tempfile %s (errno=%d)\n", - msg->content->filename, errno)); mutt_perror (msg->content->filename); goto cleanup; } @@ -1310,40 +1315,28 @@ int ci_send_message (int flags, /* send mode */ if (option (OPTHDRS)) process_user_header (msg->env); - - if (option (OPTSIGONTOP) && (!(flags & SENDKEY) && Editor)) - append_signature (tempfp); - /* include replies/forwarded messages, unless we are given a template */ if (!tempfile && (ctx || !(flags & (SENDREPLY | SENDFORWARD))) && generate_body (tempfp, msg, flags, ctx, cur) == -1) goto cleanup; - if (!option (OPTSIGONTOP) && (!(flags & SENDKEY) && Editor)) - append_signature (tempfp); + append_signature (tempfp); /* * this wants to be done _after_ generate_body, so message-hooks * 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 & (ENCRYPT | SIGN)) { - if (option (OPTPGPAUTOINLINE)) - msg->security |= INLINE; - if (option (OPTPGPREPLYINLINE) && cur && (cur->security & INLINE)) - msg->security |= INLINE; - } if (msg->security) { /* @@ -1356,10 +1349,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; } @@ -1368,11 +1360,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; } } @@ -1395,12 +1387,11 @@ int ci_send_message (int flags, /* send mode */ && !(flags & (SENDRESEND | SENDPOSTPONED))) msg->env->from->personal = m_strdup(Realname); - if (!(flags & SENDKEY)) - safe_fclose (&tempfp); + m_fclose(&tempfp); if (!(flags & SENDBATCH)) { struct stat st; - time_t mtime = mutt_decrease_mtime (msg->content->filename, NULL); + time_t mtime = m_decrease_mtime(msg->content->filename, NULL); mutt_update_encoding (msg->content); @@ -1414,23 +1405,22 @@ int ci_send_message (int flags, /* send mode */ * setting of $forward_edit because the user probably needs to add the * recipients. */ - if (!(flags & SENDKEY) && - ((flags & SENDFORWARD) == 0 || + if (((flags & SENDFORWARD) == 0 || (option (OPTEDITHDRS) && option (OPTAUTOEDIT)) || query_quadoption (OPT_FORWEDIT, - _("Edit forwarded message?")) == M_YES)) { + _("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)) { + if (rfc1524_mailcap_isneeded(msg->content)) { if (!mutt_edit_attachment (msg->content)) goto cleanup; } else if (option (OPTEDITHDRS)) { mutt_env_to_local (msg->env); - mutt_edit_headers (Editor, msg->content->filename, msg, fcc, - sizeof (fcc)); + mutt_edit_headers(msg->content->filename, msg, fcc, sizeof (fcc)); mutt_env_to_idna (msg->env, NULL, NULL); } else { - mutt_edit_file (Editor, msg->content->filename); + mutt_edit_file(msg->content->filename); if (stat (msg->content->filename, &st) == 0) { if (mtime != st.st_mtime) @@ -1445,7 +1435,7 @@ int ci_send_message (int flags, /* send mode */ mutt_message_hook (NULL, msg, M_SEND2HOOK); } - if (!(flags & (SENDPOSTPONED | SENDFORWARD | SENDKEY | SENDRESEND))) { + if (!(flags & (SENDPOSTPONED | SENDFORWARD | SENDRESEND))) { if (stat (msg->content->filename, &st) == 0) { /* if the file was not modified, bail out now */ if (mtime == st.st_mtime && !msg->content->next && @@ -1728,10 +1718,10 @@ int ci_send_message (int flags, /* send mode */ if (save_sig) { /* cleanup the second signature structures */ if (save_content->parts) { - mutt_free_body (&save_content->parts->next); + body_list_wipe(&save_content->parts->next); save_content->parts = NULL; } - mutt_free_body (&save_content); + body_list_wipe(&save_content); /* restore old signature and attachments */ msg->content->parts->next = save_sig; @@ -1739,7 +1729,7 @@ int ci_send_message (int flags, /* send mode */ } else if (save_content) { /* destroy the new encrypted body. */ - mutt_free_body (&save_content); + body_list_wipe(&save_content); } } @@ -1755,11 +1745,11 @@ int ci_send_message (int flags, /* send mode */ if ((msg->security & ENCRYPT) || ((msg->security & SIGN) && msg->content->type == TYPEAPPLICATION)) { - mutt_free_body (&msg->content); /* destroy PGP data */ + body_list_wipe(&msg->content); /* destroy PGP data */ msg->content = clear_content; /* restore clear text. */ } else if ((msg->security & SIGN) && msg->content->type == TYPEMULTIPART) { - mutt_free_body (&msg->content->parts->next); /* destroy sig */ + body_list_wipe(&msg->content->parts->next); /* destroy sig */ msg->content = mutt_remove_multipart (msg->content); } @@ -1787,7 +1777,7 @@ int ci_send_message (int flags, /* send mode */ p_delete(&pgpkeylist); if (free_clear_content) - mutt_free_body (&clear_content); + body_list_wipe(&clear_content); if (flags & SENDREPLY) { if (cur && ctx) @@ -1811,7 +1801,7 @@ cleanup: } } - safe_fclose (&tempfp); + m_fclose(&tempfp); header_delete(&msg); return rv;