X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=6d14c696827ff23ffe9be56aa9ebac0163637736;hp=fd0341be96906d3a7ae4c07025615bdc158c6c3f;hb=3fb238bec424fbc43ebe3a50eca3c84ea7bedf6a;hpb=a742b680bdba8cb47d2b81ab3397cdbec7ed5b69 diff --git a/send.c b/send.c index fd0341b..6d14c69 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); } @@ -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) { @@ -636,8 +596,10 @@ void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur) m_strreplace(&env->subject, buffer); } -void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx, - HEADER * cur, ENVELOPE * curenv) +void mutt_make_misc_reply_headers (ENVELOPE * env, + CONTEXT * ctx __attribute__ ((unused)), + HEADER * cur __attribute__ ((unused)), + ENVELOPE * curenv) { /* This takes precedence over a subject that might have * been taken from a List-Post header. Is that correct? @@ -656,6 +618,25 @@ void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx, #endif } +static string_list_t *mutt_make_references (ENVELOPE * e) +{ + string_list_t *t = NULL, *l = NULL; + + if (e->references) + l = string_list_dup(e->references); + else + l = string_list_dup(e->in_reply_to); + + if (e->message_id) { + t = string_item_new(); + t->data = m_strdup(e->message_id); + t->next = l; + l = t; + } + + return l; +} + void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv, string_list_t *** pp, string_list_t *** qq) { @@ -856,13 +837,13 @@ static int generate_body (FILE * tempfp, /* stream for outgoing message * return -1; } else if (flags & SENDKEY) { - BODY *tmp; + BODY *btmp; - if ((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 (); @@ -925,7 +906,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 +973,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 +988,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 +1048,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 +1067,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; @@ -1198,12 +1178,11 @@ int ci_send_message (int flags, /* send mode */ } 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 +1372,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; @@ -1808,7 +1787,7 @@ cleanup: } } - safe_fclose (&tempfp); + m_fclose(&tempfp); header_delete(&msg); return rv;