X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=037c6604f9fe881bb78ffe3a932b6d7667697676;hp=9de25482f2e31126f8e9e4ae2ffaf3147d6be155;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=35f4e8cefa22d98782a720e4df428a1ce3be2237 diff --git a/send.c b/send.c index 9de2548..037c660 100644 --- a/send.c +++ b/send.c @@ -7,46 +7,25 @@ * 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 "mutt.h" #include "alias.h" #include "keymap.h" #include "copy.h" -#include "mx.h" #include #include "mutt_idna.h" #include "attach.h" #ifdef USE_NNTP -#include "nntp.h" +#include #endif #ifdef MIXMASTER @@ -69,7 +48,7 @@ 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); } @@ -183,7 +162,7 @@ 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 { @@ -302,7 +281,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)); } @@ -585,25 +564,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); @@ -617,8 +577,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) { @@ -656,6 +616,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) { @@ -925,7 +904,7 @@ void mutt_set_followup_to (ENVELOPE * e) } } - e->mail_followup_to = mutt_remove_duplicates(e->mail_followup_to); + address_list_uniq(e->mail_followup_to); } } @@ -992,9 +971,9 @@ 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, @@ -1007,12 +986,12 @@ static int send_message (HEADER * msg) 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) { + if (m_fclose(&tempfp) != 0) { mutt_perror (tempfile); unlink (tempfile); return (-1); @@ -1067,7 +1046,7 @@ 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) @@ -1086,7 +1065,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; @@ -1099,8 +1077,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,7 +1156,7 @@ int ci_send_message (int flags, /* send mode */ } 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; @@ -1192,18 +1170,17 @@ 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(Tempdir), 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); } @@ -1393,7 +1370,7 @@ int ci_send_message (int flags, /* send mode */ msg->env->from->personal = m_strdup(Realname); if (!(flags & SENDKEY)) - safe_fclose (&tempfp); + m_fclose(&tempfp); if (!(flags & SENDBATCH)) { struct stat st; @@ -1417,7 +1394,7 @@ 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)) { + if (rfc1524_mailcap_isneeded(msg->content)) { if (!mutt_edit_attachment (msg->content)) goto cleanup; } else if (option (OPTEDITHDRS)) { @@ -1725,10 +1702,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; @@ -1736,7 +1713,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); } } @@ -1752,11 +1729,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); } @@ -1784,7 +1761,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) @@ -1808,7 +1785,7 @@ cleanup: } } - safe_fclose (&tempfp); + m_fclose(&tempfp); header_delete(&msg); return rv;