X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=3b51b001f24e5d0dbd63be886080b356f03df4d6;hp=851db2def84e573f604cc99cbdd8333244b51da2;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=bbc4fd52516a8afefbd14c77e34f8389d6f0a6ed diff --git a/send.c b/send.c index 851db2d..3b51b00 100644 --- a/send.c +++ b/send.c @@ -7,49 +7,27 @@ * 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 "mutt.h" -#include "enter.h" -#include "ascii.h" -#include "mutt_curses.h" -#include "rfc2047.h" +#include "alias.h" #include "keymap.h" -#include "mime.h" #include "copy.h" -#include "mx.h" -#include "mutt_crypt.h" +#include #include "mutt_idna.h" -#include "url.h" #include "attach.h" -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" -#include "lib/debug.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #ifdef USE_NNTP -#include "nntp.h" +#include #endif -#ifdef MIXMASTER #include "remailer.h" -#endif - static void append_signature (FILE * f) { @@ -66,14 +44,14 @@ static void append_signature (FILE * 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; @@ -83,7 +61,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)) @@ -93,9 +71,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) { @@ -107,13 +85,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; } } @@ -128,9 +106,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)) { @@ -144,12 +122,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; @@ -158,26 +136,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; @@ -186,16 +164,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); - mem_free (&err); + p_delete(&err); } } while (idna_ok != 0); @@ -205,39 +183,39 @@ 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)); + m_strcpy(buf, sizeof(buf), en->newsgroups); else buf[0] = 0; if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0) return (-1); - mem_free (&en->newsgroups); - en->newsgroups = str_dup (buf); + p_delete(&en->newsgroups); + en->newsgroups = m_strdup(buf); if (en->followup_to) - strfcpy (buf, en->followup_to, sizeof (buf)); + m_strcpy(buf, sizeof(buf), en->followup_to); else buf[0] = 0; if (option (OPTASKFOLLOWUP) && mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0) return (-1); - mem_free (&en->followup_to); - en->followup_to = str_dup (buf); + p_delete(&en->followup_to); + en->followup_to = m_strdup(buf); if (en->x_comment_to) - strfcpy (buf, en->x_comment_to, sizeof (buf)); + 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); - mem_free (&en->x_comment_to); - en->x_comment_to = str_dup (buf); + p_delete(&en->x_comment_to); + en->x_comment_to = m_strdup(buf); } else #endif @@ -254,7 +232,7 @@ static int edit_envelope (ENVELOPE * en, int flags) if (option (OPTFASTREPLY)) return (0); else - strfcpy (buf, en->subject, sizeof (buf)); + m_strcpy(buf, sizeof(buf), en->subject); } else { char *p; @@ -262,9 +240,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); } } } @@ -294,22 +271,21 @@ 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) +static char *nntp_get_header(const char *s) { - SKIPWS (s); - return str_dup (s); + return m_strdup(skipspaces(s)); } #endif static void process_user_recips (ENVELOPE * env) { - LIST *uh = UserHeader; + string_list_t *uh = UserHeader; for (; uh; uh = uh->next) { if (ascii_strncasecmp ("to:", uh->data, 3) == 0) @@ -331,8 +307,8 @@ static void process_user_recips (ENVELOPE * env) static void process_user_header (ENVELOPE * env) { - LIST *uh = UserHeader; - LIST *last = env->userhdrs; + string_list_t *uh = UserHeader; + string_list_t *last = env->userhdrs; if (last) while (last->next) @@ -341,15 +317,15 @@ static void process_user_header (ENVELOPE * env) 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); + 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) { - rfc822_free_address (&env->reply_to); + 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) - 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 && @@ -361,12 +337,12 @@ static void process_user_header (ENVELOPE * env) ascii_strncasecmp ("supersedes:", uh->data, 11) != 0 && ascii_strncasecmp ("subject:", uh->data, 8) != 0) { if (last) { - last->next = mutt_new_list (); + last->next = string_item_new(); last = last->next; } else - last = env->userhdrs = mutt_new_list (); - last->data = str_dup (uh->data); + last = env->userhdrs = string_item_new(); + last->data = m_strdup(uh->data); } } } @@ -377,7 +353,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); } @@ -395,7 +371,7 @@ 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)) { + if ((cur->security & ENCRYPT) && option (OPTFORWDECODE)) { /* make sure we have the user's passphrase before proceeding... */ crypt_valid_passphrase (cur->security); } @@ -444,7 +420,7 @@ 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)) { + if ((cur->security & ENCRYPT)) { /* make sure we have the user's passphrase before proceeding... */ crypt_valid_passphrase (cur->security); } @@ -468,13 +444,12 @@ static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * 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; } @@ -489,13 +464,10 @@ 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 */ @@ -504,7 +476,7 @@ static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto) if (!option (OPTREPLYSELF) && 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) || @@ -520,7 +492,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) { @@ -533,11 +505,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: @@ -545,10 +517,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); } @@ -556,7 +528,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) { @@ -569,9 +540,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) @@ -582,34 +551,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 = str_dup (e->message_id); - t->next = l; - l = t; - } - - return l; -} - void mutt_fix_reply_recipients (ENVELOPE * env) { mutt_expand_aliases_env (env); @@ -623,9 +573,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) @@ -634,33 +589,54 @@ 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) { - mem_free (&env->subject); - env->subject = mem_malloc (str_len (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 = str_dup ("Re: your mail"); + env->subject = m_strdup("Re: your mail"); #ifdef USE_NNTP if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from) - env->x_comment_to = str_dup (mutt_get_name (curenv->from)); + env->x_comment_to = m_strdup(mutt_get_name (curenv->from)); #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, - 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; @@ -680,8 +656,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 = str_dup (curenv->message_id); + *q = string_item_new(); + (*q)->data = m_strdup(curenv->message_id); } if (pp) @@ -699,7 +675,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++) { @@ -744,8 +720,8 @@ envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags) if ((flags & SENDNEWS)) { /* in case followup set Newsgroups: with Followup-To: if it present */ if (!env->newsgroups && curenv && - str_casecmp (curenv->followup_to, "poster")) - env->newsgroups = str_dup (curenv->followup_to); + m_strcasecmp(curenv->followup_to, "poster")) + env->newsgroups = m_strdup(curenv->followup_to); } else #endif @@ -856,16 +832,14 @@ 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; + else if (flags & SENDKEY) { + BODY *btmp; - if ((WithCrypto & APPLICATION_PGP) - && (tmp = crypt_pgp_make_key_attachment (NULL)) == NULL) + if ((btmp = crypt_pgp_make_key_attachment (NULL)) == NULL) return -1; - tmp->next = msg->content; - msg->content = tmp; + btmp->next = msg->content; + msg->content = btmp; } mutt_clear_error (); @@ -875,118 +849,111 @@ 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 - */ + /* + * 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 = str_dup (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)) { - /* - * 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)) - mem_free (&tmp->personal); - if (!tmp->personal) - tmp->personal = str_dup (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); + adr = address_dup(From); else if (option (OPTUSEDOMAIN)) { - adr = rfc822_new_address (); - adr->mailbox = - mem_malloc (str_len (Username) + str_len (fqdn) + 2); - sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */ - } - else { - adr = rfc822_new_address (); - adr->mailbox = str_dup (NONULL (Username)); + const char *fqdn = mutt_fqdn (1); + adr = address_new(); + adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2); + sprintf(adr->mailbox, "%s@%s", NONULL(Username), NONULL(fqdn)); + } else { + adr = address_new (); + adr->mailbox = m_strdup(NONULL(Username)); } return (adr); @@ -999,36 +966,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(Tempdir), 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, @@ -1064,11 +1023,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); @@ -1080,7 +1052,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; @@ -1093,8 +1064,9 @@ 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; @@ -1119,8 +1091,8 @@ int ci_send_message (int flags, /* send mode */ } - if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) - signas = str_dup (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 @@ -1128,7 +1100,7 @@ int ci_send_message (int flags, /* send mode */ */ if (!msg) { - msg = mutt_new_header (); + msg = header_new(); if (flags == SENDPOSTPONED) { if ((flags = @@ -1158,7 +1130,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 */ @@ -1167,35 +1139,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 (); + 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 = str_dup (buffer); - } - else { - tempfp = safe_fopen (tempfile, "a+"); - msg->content->filename = str_dup (tempfile); + char buffer[_POSIX_PATH_MAX]; + tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(Tempdir), NULL); + msg->content->filename = m_strdup(buffer); + } 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; } @@ -1244,11 +1220,10 @@ 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 = str_dup (((NNTP_DATA *) ctx->data)->group); + 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; @@ -1289,7 +1264,7 @@ 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; } @@ -1297,9 +1272,7 @@ int ci_send_message (int flags, /* send mode */ process_user_header (msg->env); - if (option (OPTSIGONTOP) - && (!(flags & (SENDMAILX | SENDKEY)) && Editor - && str_cmp (Editor, "builtin") != 0)) + if (option (OPTSIGONTOP) && (!(flags & SENDKEY) && Editor)) append_signature (tempfp); /* include replies/forwarded messages, unless we are given a template */ @@ -1307,9 +1280,7 @@ int ci_send_message (int flags, /* send mode */ && generate_body (tempfp, msg, flags, ctx, cur) == -1) goto cleanup; - if (!option (OPTSIGONTOP) - && (!(flags & (SENDMAILX | SENDKEY)) && Editor - && str_cmp (Editor, "builtin") != 0)) + if (!option (OPTSIGONTOP) && (!(flags & SENDKEY) && Editor)) append_signature (tempfp); /* @@ -1317,27 +1288,25 @@ int ci_send_message (int flags, /* send mode */ * 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, @@ -1348,11 +1317,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 (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; } @@ -1362,13 +1329,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 (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; } } @@ -1389,18 +1354,14 @@ 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 = str_dup (Realname); + msg->env->from->personal = m_strdup(Realname); - if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY))) - safe_fclose (&tempfp); + if (!(flags & SENDKEY)) + 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); @@ -1420,19 +1381,28 @@ int ci_send_message (int flags, /* send mode */ query_quadoption (OPT_FORWEDIT, _("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 || str_cmp ("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_env_to_idna (msg->env, NULL, NULL); } - else + else { mutt_edit_file (Editor, 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); } @@ -1465,7 +1435,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; } } @@ -1473,7 +1443,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 */ @@ -1541,7 +1511,7 @@ int ci_send_message (int flags, /* send mode */ if (mutt_env_to_idna (msg->env, &tag, &err)) { mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err); - mem_free (&err); + p_delete(&err); if (!(flags & SENDBATCH)) goto main_loop; else @@ -1575,6 +1545,20 @@ int ci_send_message (int flags, /* send mode */ 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; + } + /* * Ok, we need to do it this way instead of handling all fcc stuff in * one place in order to avoid going to main_loop with encoded "env" @@ -1593,40 +1577,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); - mem_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); @@ -1645,24 +1627,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_get_magic (fcc) == M_IMAP) fcc[0] = '\0'; -#endif - if (*fcc && str_cmp ("/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 - && (str_cmp (msg->content->subtype, "encrypted") == 0 || - str_cmp (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 */ @@ -1706,21 +1686,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); } } @@ -1733,15 +1713,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); } @@ -1756,20 +1735,20 @@ int ci_send_message (int flags, /* send mode */ 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 (msg->security & ENCRYPT) + p_delete(&pgpkeylist); - if (WithCrypto && (msg->security & ENCRYPT)) - mem_free (&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) @@ -1786,15 +1765,15 @@ int ci_send_message (int flags, /* send mode */ cleanup: - if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) { + if (flags & SENDPOSTPONED) { if (signas) { - mem_free (&PgpSignAs); + p_delete(&PgpSignAs); PgpSignAs = signas; } } - safe_fclose (&tempfp); - mutt_free_header (&msg); + m_fclose(&tempfp); + header_delete(&msg); return rv; }