X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=05536b8ff9a51ba10b607d276dc240332c85bfef;hp=c9cbb3b502b442e522c84f6756ef7284b5fa86a1;hb=00f34116b32751764d42f81159c292d850c74bac;hpb=ee1d4d931ca3ebec494694b74a1868a7a2e631e3 diff --git a/send.c b/send.c index c9cbb3b..05536b8 100644 --- a/send.c +++ b/send.c @@ -7,46 +7,81 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include -#include "mutt.h" -#include "mutt_curses.h" -#include "rfc2047.h" +#include +#include +#include +#include +#include +#include + +#include "alias.h" #include "keymap.h" -#include "mime.h" #include "copy.h" -#include "mx.h" -#include "mutt_crypt.h" +#include "crypt.h" #include "mutt_idna.h" -#include "url.h" - -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef USE_NNTP -#include "nntp.h" -#endif - -#ifdef MIXMASTER -#include "remailer.h" -#endif +#include "attach.h" +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; @@ -56,20 +91,20 @@ 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); } } /* compare two e-mail addresses and return 1 if they are equivalent */ -static int mutt_addrcmp (ADDRESS * a, ADDRESS * b) +static int mutt_addrcmp (address_t * a, address_t * b) { if (!a->mailbox || !b->mailbox) return 0; @@ -79,7 +114,7 @@ static int mutt_addrcmp (ADDRESS * a, ADDRESS * b) } /* search an e-mail address in a list */ -static int mutt_addrsrc (ADDRESS * a, ADDRESS * lst) +static int mutt_addrsrc (address_t * a, address_t * lst) { for (; lst; lst = lst->next) { if (mutt_addrcmp (a, lst)) @@ -89,9 +124,9 @@ static int mutt_addrsrc (ADDRESS * a, ADDRESS * lst) } /* removes addresses from "b" which are contained in "a" */ -static ADDRESS *mutt_remove_xrefs (ADDRESS * a, ADDRESS * b) +static address_t *mutt_remove_xrefs (address_t * a, address_t * b) { - ADDRESS *top, *p, *prev = NULL; + address_t *top, *p, *prev = NULL; top = b; while (b) { @@ -103,13 +138,13 @@ static ADDRESS *mutt_remove_xrefs (ADDRESS * a, ADDRESS * b) if (prev) { prev->next = b->next; b->next = NULL; - rfc822_free_address (&b); + address_list_wipe(&b); b = prev; } else { top = top->next; b->next = NULL; - rfc822_free_address (&b); + address_list_wipe(&b); b = top; } } @@ -124,9 +159,9 @@ static ADDRESS *mutt_remove_xrefs (ADDRESS * a, ADDRESS * b) /* remove any address which matches the current user. if `leave_only' is * nonzero, don't remove the user's address if it is the only one in the list */ -static ADDRESS *remove_user (ADDRESS * a, int leave_only) +static address_t *remove_user (address_t * a, int leave_only) { - ADDRESS *top = NULL, *last = NULL; + address_t *top = NULL, *last = NULL; while (a) { if (!mutt_addr_is_user (a)) { @@ -140,12 +175,12 @@ static ADDRESS *remove_user (ADDRESS * a, int leave_only) last->next = NULL; } else { - ADDRESS *tmp = a; + address_t *tmp = a; a = a->next; if (!leave_only || a || last) { tmp->next = NULL; - rfc822_free_address (&tmp); + address_list_wipe(&tmp); } else last = top = tmp; @@ -154,26 +189,26 @@ static ADDRESS *remove_user (ADDRESS * a, int leave_only) return top; } -static ADDRESS *find_mailing_lists (ADDRESS * t, ADDRESS * c) +static address_t *find_mailing_lists (address_t * t, address_t * c) { - ADDRESS *top = NULL, *ptr = NULL; + address_t *top = NULL, *ptr = NULL; for (; t || c; t = c, c = NULL) { for (; t; t = t->next) { if (mutt_is_mail_list (t) && !t->group) { if (top) { - ptr->next = rfc822_cpy_adr_real (t); + ptr->next = address_dup (t); ptr = ptr->next; } else - ptr = top = rfc822_cpy_adr_real (t); + ptr = top = address_dup (t); } } } return top; } -static int edit_address (ADDRESS ** a, /* const */ char *field) +static int edit_address (address_t ** a, const char *field) { char buf[HUGE_STRING]; char *err = NULL; @@ -182,16 +217,16 @@ static int edit_address (ADDRESS ** a, /* const */ char *field) 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); - rfc822_free_address (a); + address_list_wipe(a); *a = mutt_expand_aliases (mutt_parse_adrlist (NULL, buf)); if ((idna_ok = mutt_addrlist_to_idna (*a, &err)) != 0) { mutt_error (_("Error: '%s' is a bad IDN."), err); mutt_refresh (); mutt_sleep (2); - FREE (&err); + p_delete(&err); } } while (idna_ok != 0); @@ -201,56 +236,21 @@ static int edit_address (ADDRESS ** a, /* const */ char *field) static int edit_envelope (ENVELOPE * en, int flags) { char buf[HUGE_STRING]; - LIST *uh = UserHeader; + string_list_t *uh = UserHeader; regmatch_t pat_match[1]; -#ifdef USE_NNTP - if (option (OPTNEWSSEND)) { - if (en->newsgroups) - strfcpy (buf, en->newsgroups, sizeof (buf)); - else - buf[0] = 0; - if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0) - return (-1); - FREE (&en->newsgroups); - en->newsgroups = safe_strdup (buf); - - if (en->followup_to) - strfcpy (buf, en->followup_to, sizeof (buf)); - else - buf[0] = 0; - if (option (OPTASKFOLLOWUP) - && mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0) - return (-1); - FREE (&en->followup_to); - en->followup_to = safe_strdup (buf); - - if (en->x_comment_to) - strfcpy (buf, en->x_comment_to, sizeof (buf)); - else - buf[0] = 0; - if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO) - && mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0) - return (-1); - FREE (&en->x_comment_to); - en->x_comment_to = safe_strdup (buf); - } - else -#endif - { - if (edit_address (&en->to, "To: ") == -1 || en->to == NULL) - return (-1); - if (option (OPTASKCC) && edit_address (&en->cc, "Cc: ") == -1) - return (-1); - if (option (OPTASKBCC) && edit_address (&en->bcc, "Bcc: ") == -1) - return (-1); - } + if (edit_address (&en->to, "To: ") == -1 || en->to == NULL) + return (-1); + if (option (OPTASKCC) && edit_address (&en->cc, "Cc: ") == -1) + return (-1); + if (option (OPTASKBCC) && edit_address (&en->bcc, "Bcc: ") == -1) + return (-1); if (en->subject) { if (option (OPTFASTREPLY)) return (0); else - strfcpy (buf, en->subject, sizeof (buf)); + m_strcpy(buf, sizeof(buf), en->subject); } else { char *p; @@ -258,9 +258,8 @@ static int edit_envelope (ENVELOPE * en, int flags) buf[0] = 0; for (; uh; uh = uh->next) { if (ascii_strncasecmp ("subject:", uh->data, 8) == 0) { - p = uh->data + 8; - SKIPWS (p); - strncpy (buf, p, sizeof (buf)); + p = vskipspaces(uh->data + 8); + m_strcpy(buf, sizeof(buf), p); } } } @@ -290,99 +289,76 @@ static int edit_envelope (ENVELOPE * en, int flags) return (-1); } - str_replace (&en->subject, buf); + m_strreplace(&en->subject, buf); return 0; } -#ifdef USE_NNTP -char *nntp_get_header (const char *s) -{ - SKIPWS (s); - return safe_strdup (s); -} -#endif - static void process_user_recips (ENVELOPE * env) { - LIST *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); -#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); -#endif - } -} + string_list_t *uh = UserHeader; -static void process_user_header (ENVELOPE * env) -{ - LIST *uh = UserHeader; - LIST *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 */ - rfc822_free_address (&env->from); - env->from = rfc822_parse_adrlist (env->from, uh->data + 5); - } - else if (ascii_strncasecmp ("reply-to:", uh->data, 9) == 0) { - rfc822_free_address (&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) - str_replace (&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 && -#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 && -#endif - ascii_strncasecmp ("supersedes:", uh->data, 11) != 0 && - ascii_strncasecmp ("subject:", uh->data, 8) != 0) { - if (last) { - last->next = mutt_new_list (); - last = last->next; - } - else - last = env->userhdrs = mutt_new_list (); - last->data = safe_strdup (uh->data); + 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; + default: break; + } } - } } -LIST *mutt_copy_list (LIST * p) +static void process_user_header(ENVELOPE * env) { - LIST *t, *r = NULL, *l = NULL; - - for (; p; p = p->next) { - t = (LIST *) safe_malloc (sizeof (LIST)); - t->data = safe_strdup (p->data); - t->next = NULL; - if (l) { - r->next = t; - r = r->next; + 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: + 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; + } } - else - l = r = t; - } - return (l); } void mutt_forward_intro (FILE * fp, HEADER * cur) @@ -391,7 +367,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); } @@ -409,11 +385,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 (WithCrypto && (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)) { @@ -442,30 +413,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 (WithCrypto && (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)) @@ -476,19 +430,15 @@ 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; } -static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto) +static int default_to (address_t ** to, ENVELOPE * env, int flags, int hmfupto) { char prompt[STRING]; - ADDRESS *tmp; if (flags && env->mail_followup_to && hmfupto == M_YES) { - rfc822_append (to, env->mail_followup_to); + address_list_append(to, address_list_dup(env->mail_followup_to)); return 0; } @@ -503,22 +453,19 @@ static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto) */ if (!(flags & SENDGROUPREPLY) && mutt_is_list_cc (0, env->to, env->cc)) { switch (query_quadoption (OPT_LISTREPLY, - _ - ("Message came from a mailing list. Reply to author only?"))) + _("Message came from a mailing list. List-reply to mailing list?"))) { - case M_NO: - tmp = find_mailing_lists (env->to, env->cc); - rfc822_append (to, tmp); - rfc822_free_address (&tmp); + case M_YES: + address_list_append(to, find_mailing_lists (env->to, env->cc)); return 0; case -1: return -1; /* abort */ } } - if (!option (OPTREPLYSELF) && mutt_addr_is_user (env->from)) { + if (mutt_addr_is_user(env->from)) { /* mail is from the user, assume replying to recipients */ - rfc822_append (to, env->to); + address_list_append(to, address_list_dup(env->to)); } else if (env->reply_to) { if ((mutt_addrcmp (env->from, env->reply_to) && !env->reply_to->next) || @@ -534,7 +481,7 @@ static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto) * in his From header. * */ - rfc822_append (to, env->from); + address_list_append(to, address_list_dup(env->from)); } else if (!(mutt_addrcmp (env->from, env->reply_to) && !env->reply_to->next) && quadoption (OPT_REPLYTO) != M_YES) { @@ -547,11 +494,11 @@ static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto) env->reply_to->mailbox, env->reply_to->next ? ",..." : ""); switch (query_quadoption (OPT_REPLYTO, prompt)) { case M_YES: - rfc822_append (to, env->reply_to); + address_list_append(to, address_list_dup(env->reply_to)); break; case M_NO: - rfc822_append (to, env->from); + address_list_append(to, address_list_dup(env->from)); break; default: @@ -559,10 +506,10 @@ static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto) } } else - rfc822_append (to, env->reply_to); + address_list_append(to, address_list_dup(env->reply_to)); } else - rfc822_append (to, env->from); + address_list_append(to, address_list_dup(env->from)); return (0); } @@ -570,7 +517,6 @@ static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto) int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags) { char prompt[STRING]; - ADDRESS *tmp; int hmfupto = -1; if ((flags & (SENDLISTREPLY | SENDGROUPREPLY)) && in->mail_followup_to) { @@ -583,9 +529,7 @@ int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags) } if (flags & SENDLISTREPLY) { - tmp = find_mailing_lists (in->to, in->cc); - rfc822_append (&out->to, tmp); - rfc822_free_address (&tmp); + address_list_append(&out->to, find_mailing_lists(in->to, in->cc)); if (in->mail_followup_to && hmfupto == M_YES && default_to (&out->cc, in, flags & SENDLISTREPLY, hmfupto) == -1) @@ -596,34 +540,15 @@ int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags) return (-1); /* abort */ 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); + && (!in->mail_followup_to || hmfupto != M_YES)) + { + address_t **tmp = address_list_append(&out->cc, address_list_dup(in->to)); + address_list_append(tmp, address_list_dup(in->cc)); } } return 0; } -LIST *mutt_make_references (ENVELOPE * e) -{ - LIST *t = NULL, *l = NULL; - - if (e->references) - l = mutt_copy_list (e->references); - else - l = mutt_copy_list (e->in_reply_to); - - if (e->message_id) { - t = mutt_new_list (); - t->data = safe_strdup (e->message_id); - t->next = l; - l = t; - } - - return l; -} - void mutt_fix_reply_recipients (ENVELOPE * env) { mutt_expand_aliases_env (env); @@ -637,9 +562,14 @@ 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) { + env->to = env->cc; + env->cc = NULL; + } } void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur) @@ -648,33 +578,49 @@ void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur) /* 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, - 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? */ if (curenv->real_subj) { - FREE (&env->subject); - env->subject = safe_malloc (safe_strlen (curenv->real_subj) + 5); - sprintf (env->subject, "Re: %s", curenv->real_subj); /* __SPRINTF_CHECKED__ */ + p_delete(&env->subject); + env->subject = p_new(char, m_strlen(curenv->real_subj) + 5); + sprintf (env->subject, "Re: %s", curenv->real_subj); } else if (!env->subject) - env->subject = safe_strdup ("Re: your mail"); + env->subject = m_strdup("Re: your mail"); +} + +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); -#ifdef USE_NNTP - if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from) - env->x_comment_to = safe_strdup (mutt_get_name (curenv->from)); -#endif + 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, - LIST *** pp, LIST *** qq) + string_list_t *** pp, string_list_t *** qq) { - LIST **p = NULL, **q = NULL; + string_list_t **p = NULL, **q = NULL; if (pp) p = *pp; @@ -694,8 +640,8 @@ void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv, *p = mutt_make_references (curenv); if (curenv->message_id) { - *q = mutt_new_list (); - (*q)->data = safe_strdup (curenv->message_id); + *q = string_item_new(); + (*q)->data = m_strdup(curenv->message_id); } if (pp) @@ -713,7 +659,7 @@ mutt_make_reference_headers (ENVELOPE * curenv, ENVELOPE * env, CONTEXT * ctx) if (!curenv) { HEADER *h; - LIST **p = NULL, **q = NULL; + string_list_t **p = NULL, **q = NULL; int i; for (i = 0; i < ctx->vcount; i++) { @@ -754,15 +700,6 @@ envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags) curenv = cur->env; if (flags & SENDREPLY) { -#ifdef USE_NNTP - if ((flags & SENDNEWS)) { - /* in case followup set Newsgroups: with Followup-To: if it present */ - if (!env->newsgroups && curenv && - safe_strcasecmp (curenv->followup_to, "poster")) - env->newsgroups = safe_strdup (curenv->followup_to); - } - else -#endif if (tag) { HEADER *h; @@ -870,17 +807,6 @@ static int generate_body (FILE * tempfp, /* stream for outgoing message * else if (i == -1) return -1; } - /* if (WithCrypto && (flags & SENDKEY)) */ - else if ((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)) { - BODY *tmp; - - if ((WithCrypto & APPLICATION_PGP) - && (tmp = crypt_pgp_make_key_attachment (NULL)) == NULL) - return -1; - - tmp->next = msg->content; - msg->content = tmp; - } mutt_clear_error (); @@ -889,118 +815,103 @@ static int generate_body (FILE * tempfp, /* stream for outgoing message * void mutt_set_followup_to (ENVELOPE * e) { - ADDRESS *t = NULL; - ADDRESS *from; + /* + * Only generate the Mail-Followup-To if the user has requested it, and + * it hasn't already been set + */ + if (!option(OPTFOLLOWUPTO)) + return; - /* - * Only generate the Mail-Followup-To if the user has requested it, and - * it hasn't already been set - */ + if (e->mail_followup_to) + return; - if (!option (OPTFOLLOWUPTO)) - return; -#ifdef USE_NNTP - if (option (OPTNEWSSEND)) { - if (!e->followup_to && e->newsgroups && (strrchr (e->newsgroups, ','))) - e->followup_to = safe_strdup (e->newsgroups); - return; - } -#endif - - if (!e->mail_followup_to) { if (mutt_is_list_cc (0, e->to, e->cc)) { - /* - * this message goes to known mailing lists, so create a proper - * mail-followup-to header - */ + address_t **tmp; - t = rfc822_append (&e->mail_followup_to, e->to); - rfc822_append (&t, 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 = rfc822_cpy_adr (e->reply_to); - else if (e->from) - from = rfc822_cpy_adr (e->from); - else - from = mutt_default_from (); - - if (from) { - /* Normally, this loop will not even be entered. */ - for (t = from; t && t->next; t = t->next); + 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(); - t->next = e->mail_followup_to; /* t cannot be NULL at this point. */ + 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); } /* look through the recipients of the message we are replying to, and if we find an address that matches $alternates, we use that as the default from field */ -static ADDRESS *set_reverse_name (ENVELOPE * env) +static address_t *set_reverse_name (ENVELOPE * env) { - ADDRESS *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 = rfc822_cpy_adr_real (tmp); - if (!option (OPTREVREAL)) - FREE (&tmp->personal); - if (!tmp->personal) - tmp->personal = safe_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 *mutt_default_from (void) +address_t *mutt_default_from (void) { - ADDRESS *adr; - const char *fqdn = mutt_fqdn (1); + address_t *adr; - /* - * 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 = rfc822_cpy_adr_real (From); - else if (option (OPTUSEDOMAIN)) { - adr = rfc822_new_address (); - adr->mailbox = - safe_malloc (safe_strlen (Username) + safe_strlen (fqdn) + 2); - sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */ - } - else { - adr = rfc822_new_address (); - adr->mailbox = safe_strdup (NONULL (Username)); + if (MAlias.from) + adr = address_dup(MAlias.from); + else if (mod_core.use_domain) { + const char *fqdn = mutt_fqdn (1); + adr = address_new(); + 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(mod_core.username)); } return (adr); @@ -1013,37 +924,25 @@ 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); - -#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 + 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); 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, (msg->content->encoding == ENC8BIT)); @@ -1078,11 +977,24 @@ static void decode_descriptions (BODY * b) } } +static void fix_end_of_file (const char *data) +{ + FILE *fp; + int c; + + if ((fp = safe_fopen (data, "a+")) == NULL) + return; + fseeko (fp, -1, SEEK_END); + if ((c = fgetc (fp)) != '\n') + fputc ('\n', fp); + m_fclose(&fp); +} + 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) + if (mutt_prepare_template (fp, ctx, msg, cur, option(OPTWEED)) < 0) return -1; return ci_send_message (SENDRESEND, msg, NULL, ctx, cur); @@ -1094,7 +1006,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; @@ -1107,18 +1018,12 @@ int ci_send_message (int flags, /* send mode */ char *pgpkeylist = NULL; /* save current value of "pgp_sign_as" */ - char *signas = NULL; - char *tag = NULL, *err = NULL; + char *signas = NULL, *err = NULL; + const char *tag = NULL; + char *ctype; int rv = -1; -#ifdef USE_NNTP - if (flags & SENDNEWS) - set_option (OPTNEWSSEND); - else - unset_option (OPTNEWSSEND); -#endif - if (!flags && !msg && quadoption (OPT_RECALL) != M_NO && mutt_num_postponed (1)) { /* If the user is composing a new message, check to see if there @@ -1133,8 +1038,8 @@ int ci_send_message (int flags, /* send mode */ } - if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) - signas = safe_strdup (PgpSignAs); + if (flags & SENDPOSTPONED) + signas = m_strdup(PgpSignAs); /* Delay expansion of aliases until absolutely necessary--shouldn't * be necessary unless we are prompting the user or about to execute a @@ -1142,26 +1047,12 @@ int ci_send_message (int flags, /* send mode */ */ if (!msg) { - msg = mutt_new_header (); + msg = header_new(); if (flags == SENDPOSTPONED) { if ((flags = mutt_get_postponed (ctx, msg, &cur, fcc, sizeof (fcc))) < 0) goto cleanup; -#ifdef USE_NNTP - /* - * If postponed message is a news article, it have - * a "Newsgroups:" header line, then set appropriate flag. - */ - if (msg->env->newsgroups) { - flags |= SENDNEWS; - set_option (OPTNEWSSEND); - } - else { - flags &= ~SENDNEWS; - unset_option (OPTNEWSSEND); - } -#endif } if (flags & (SENDPOSTPONED | SENDRESEND)) { @@ -1172,7 +1063,7 @@ int ci_send_message (int flags, /* send mode */ } if (!msg->env) - msg->env = mutt_new_envelope (); + msg->env = envelope_new(); } /* Parse and use an eventual list-post header */ @@ -1181,37 +1072,39 @@ int ci_send_message (int flags, /* send mode */ /* Use any list-post header as a template */ url_parse_mailto (msg->env, NULL, cur->env->list_post); /* We don't let them set the sender's address. */ - rfc822_free_address (&msg->env->from); + 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; - mutt_parse_content_type (ContentType, msg->content); + if (!(ctype = m_strdup(ContentType))) + ctype = m_strdup("text/plain"); + mutt_parse_content_type (ctype, msg->content); + p_delete(&ctype); + msg->content->unlink = 1; msg->content->use_disp = 0; 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); + && !ascii_strcasecmp (msg->content->subtype, "plain")) { + parameter_setval(&msg->content->parameter, "format", "flowed"); + if (option (OPTDELSP)) + parameter_setval(&msg->content->parameter, "delsp", "yes"); + } if (!tempfile) { - mutt_mktemp (buffer); - tempfp = safe_fopen (buffer, "w+"); - msg->content->filename = safe_strdup (buffer); - } - else { - tempfp = safe_fopen (tempfile, "a+"); - msg->content->filename = safe_strdup (tempfile); + char buffer[_POSIX_PATH_MAX]; + tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(mod_core.tmpdir), NULL); + msg->content->filename = m_strdup(buffer); + } else { + tempfp = safe_fopen(tempfile, "a+"); + msg->content->filename = m_strdup(tempfile); } if (!tempfp) { - dprint (1, - (debugfile, - "newsend_message: can't create tempfile %s (errno=%d)\n", - msg->content->filename, errno)); mutt_perror (msg->content->filename); goto cleanup; } @@ -1240,10 +1133,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))) { @@ -1251,20 +1142,12 @@ 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); -#ifdef USE_NNTP - if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP - && !msg->env->newsgroups) - msg->env->newsgroups = safe_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; @@ -1305,55 +1188,36 @@ int ci_send_message (int flags, /* send mode */ msg->replied = 0; if (killfrom) { - rfc822_free_address (&msg->env->from); + address_list_wipe(&msg->env->from); killfrom = 0; } - if (option (OPTHDRS)) - process_user_header (msg->env); - - - if (option (OPTSIGONTOP) - && (!(flags & (SENDMAILX | SENDKEY)) && Editor - && safe_strcmp (Editor, "builtin") != 0)) - append_signature (tempfp); + process_user_header (msg->env); /* 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 & (SENDMAILX | SENDKEY)) && Editor - && safe_strcmp (Editor, "builtin") != 0)) - append_signature (tempfp); + 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 (mod_crypt.autosign) + msg->security |= SIGN; + if (mod_crypt.autoencrypt) + msg->security |= ENCRYPT; + if (mod_crypt.replyencrypt && cur && (cur->security & ENCRYPT)) + msg->security |= ENCRYPT; + if (mod_crypt.replysign && cur && (cur->security & SIGN)) + msg->security |= SIGN; + if (mod_crypt.replysignencrypted && cur && (cur->security & ENCRYPT)) + msg->security |= SIGN; - if (WithCrypto && msg->security) { + if (msg->security) { /* * When reypling / forwarding, use the original message's * crypto system. According to the documentation, @@ -1364,12 +1228,9 @@ int ci_send_message (int flags, /* send mode */ * disable individual mechanisms at run-time? */ if (cur) { - if ((WithCrypto & APPLICATION_PGP) && option (OPTCRYPTAUTOPGP) - && (cur->security & APPLICATION_PGP)) + if (mod_crypt.autopgp && (cur->security & APPLICATION_PGP)) msg->security |= APPLICATION_PGP; - else if ((WithCrypto & APPLICATION_SMIME) - && option (OPTCRYPTAUTOSMIME) - && (cur->security & APPLICATION_SMIME)) + else if (mod_crypt.autosmime && (cur->security & APPLICATION_SMIME)) msg->security |= APPLICATION_SMIME; } @@ -1378,13 +1239,11 @@ int ci_send_message (int flags, /* send mode */ * for the decision. */ if (!(msg->security & (APPLICATION_SMIME | APPLICATION_PGP))) { - if ((WithCrypto & APPLICATION_SMIME) && option (OPTCRYPTAUTOSMIME) - && option (OPTSMIMEISDEFAULT)) + if (mod_crypt.autosmime && mod_crypt.smime_is_default) msg->security |= APPLICATION_SMIME; - else if ((WithCrypto & APPLICATION_PGP) && option (OPTCRYPTAUTOPGP)) + else if (mod_crypt.autopgp) msg->security |= APPLICATION_PGP; - else if ((WithCrypto & APPLICATION_SMIME) - && option (OPTCRYPTAUTOSMIME)) + else if (mod_crypt.autosmime) msg->security |= APPLICATION_SMIME; } } @@ -1405,18 +1264,13 @@ int ci_send_message (int flags, /* send mode */ that $realname can be set in a send-hook */ if (msg->env->from && !msg->env->from->personal && !(flags & (SENDRESEND | SENDPOSTPONED))) - msg->env->from->personal = safe_strdup (Realname); + msg->env->from->personal = m_strdup(Realname); - if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY))) - safe_fclose (&tempfp); + m_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); + time_t mtime = m_decrease_mtime(msg->content->filename, NULL); mutt_update_encoding (msg->content); @@ -1430,29 +1284,37 @@ 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)) - mutt_edit_attachment (msg->content); - else if (!Editor || safe_strcmp ("builtin", Editor) == 0) - mutt_builtin_editor (msg->content->filename, msg, cur); - else if (option (OPTEDITHDRS)) { + 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); + else { + mutt_edit_file(msg->content->filename); + + if (stat (msg->content->filename, &st) == 0) { + if (mtime != st.st_mtime) + fix_end_of_file (msg->content->filename); + } else + mutt_perror (msg->content->filename); + } + + if (option (OPTTEXTFLOWED)) + rfc3676_space_stuff (msg); 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 && @@ -1481,7 +1343,7 @@ int ci_send_message (int flags, /* send mode */ } mutt_select_fcc (fcc, sizeof (fcc), msg); if (killfrom) { - rfc822_free_address (&msg->env->from); + address_list_wipe(&msg->env->from); killfrom = 0; } } @@ -1489,7 +1351,7 @@ int ci_send_message (int flags, /* send mode */ 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 */ @@ -1497,13 +1359,7 @@ int ci_send_message (int flags, /* send mode */ i = mutt_compose_menu (msg, fcc, sizeof (fcc), cur); if (i == -1) { /* abort */ -#ifdef USE_NNTP - if (flags & SENDNEWS) - mutt_message (_("Article not posted.")); - - else -#endif - mutt_message _("Mail not sent."); + mutt_message _("Mail not sent."); goto cleanup; } else if (i == 1) { @@ -1539,25 +1395,22 @@ int ci_send_message (int flags, /* send mode */ } } -#ifdef USE_NNTP - if (!(flags & SENDNEWS)) -#endif - if (!msg->env->to && !msg->env->cc && !msg->env->bcc) { - if (!(flags & SENDBATCH)) { - mutt_error _("No recipients are specified!"); + if (!msg->env->to && !msg->env->cc && !msg->env->bcc) { + if (!(flags & SENDBATCH)) { + mutt_error _("No recipients are specified!"); - goto main_loop; - } - else { - puts _("No recipients were specified."); + goto main_loop; + } + else { + puts _("No recipients were specified."); - goto cleanup; - } + goto cleanup; } + } if (mutt_env_to_idna (msg->env, &tag, &err)) { mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err); - FREE (&err); + p_delete(&err); if (!(flags & SENDBATCH)) goto main_loop; else @@ -1574,22 +1427,23 @@ int ci_send_message (int flags, /* send mode */ goto main_loop; } -#ifdef USE_NNTP - if ((flags & SENDNEWS) && !msg->env->subject) { - mutt_error _("No subject specified."); - goto main_loop; - } - - if ((flags & SENDNEWS) && !msg->env->newsgroups) { - mutt_error _("No newsgroup specified."); + if (msg->content->next) + msg->content = mutt_make_multipart (msg->content); + if (mutt_attach_check (msg) && + !msg->content->next && + query_quadoption (OPT_ATTACH, + _("No attachments made but indicator found in text. " + "Cancel sending?")) == M_YES) { + if (quadoption (OPT_ATTACH) == M_YES) { + mutt_message _("No attachments made but indicator found in text. " + "Abort sending."); + sleep (2); + } + mutt_message (_("Mail not sent.")); goto main_loop; } -#endif - - if (msg->content->next) - msg->content = mutt_make_multipart (msg->content); /* * Ok, we need to do it this way instead of handling all fcc stuff in @@ -1609,40 +1463,38 @@ int ci_send_message (int flags, /* send mode */ 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); - FREE (&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); @@ -1661,24 +1513,22 @@ int ci_send_message (int flags, /* send mode */ * I'd like to think a bit more about this before including it. */ -#ifdef USE_IMAP - if ((flags & SENDBATCH) && fcc[0] && mx_is_imap (fcc)) + if ((flags & SENDBATCH) && fcc[0] && mx_get_magic (fcc) == M_IMAP) fcc[0] = '\0'; -#endif - if (*fcc && safe_strcmp ("/dev/null", fcc) != 0) { + 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 - && (safe_strcmp (msg->content->subtype, "encrypted") == 0 || - safe_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 */ @@ -1722,21 +1572,21 @@ int ci_send_message (int flags, /* send mode */ 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); + 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; 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); + body_list_wipe(&save_content); } } @@ -1749,15 +1599,14 @@ int ci_send_message (int flags, /* send mode */ */ 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)) { - mutt_free_body (&msg->content); /* destroy PGP data */ + if ((msg->security & ENCRYPT) + || ((msg->security & SIGN) + && msg->content->type == TYPEAPPLICATION)) { + 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); } @@ -1772,20 +1621,13 @@ int ci_send_message (int flags, /* send mode */ goto cleanup; } } - else if (!option (OPTNOCURSES) && !(flags & SENDMAILX)) - mutt_message (i != 0 ? _("Sending in background.") : -#ifdef USE_NNTP - (flags & SENDNEWS) ? _("Article posted.") : - _("Mail sent.")); -#else - _("Mail sent.")); -#endif - - if (WithCrypto && (msg->security & ENCRYPT)) - FREE (&pgpkeylist); + else if (!option (OPTNOCURSES)) + mutt_message (i != 0 ? _("Sending in background.") : _("Mail sent.")); + if (msg->security & ENCRYPT) + p_delete(&pgpkeylist); - if (WithCrypto && free_clear_content) - mutt_free_body (&clear_content); + if (free_clear_content) + body_list_wipe(&clear_content); if (flags & SENDREPLY) { if (cur && ctx) @@ -1802,15 +1644,15 @@ int ci_send_message (int flags, /* send mode */ cleanup: - if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) { + if (flags & SENDPOSTPONED) { if (signas) { - FREE (&PgpSignAs); + p_delete(&PgpSignAs); PgpSignAs = signas; } } - safe_fclose (&tempfp); - mutt_free_header (&msg); + m_fclose(&tempfp); + header_delete(&msg); return rv; }