X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=febe91eeab5c3c69e176aa0fb8989547423fdab5;hp=a66665c788307ac144ab07bef88c8cea31c515a8;hb=7b392ef7b50798f9eb3e7c869e634c5fef0092d1;hpb=230399f9632c37b66c1c117a17e8327eae6b3235 diff --git a/attach.c b/attach.c index a66665c..febe91e 100644 --- a/attach.c +++ b/attach.c @@ -8,27 +8,13 @@ * 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 "mutt.h" #include "handler.h" @@ -36,7 +22,6 @@ #include "keymap.h" #include "pager.h" #include "copy.h" -#include "mx.h" #include int mutt_get_tmp_attachment (BODY * a) @@ -126,7 +111,6 @@ int mutt_compose_attachment (BODY * a) if (r != -1 && entry->composetypecommand) { BODY *b; FILE *fp, *tfp; - char tempfile[_POSIX_PATH_MAX]; if ((fp = safe_fopen (a->filename, "r")) == NULL) { mutt_perror (_("Failure to open file to parse headers.")); @@ -136,6 +120,8 @@ int mutt_compose_attachment (BODY * a) b = mutt_read_mime_header (fp, 0); if (b) { + char tempfile[_POSIX_PATH_MAX]; + if (b->parameter) { parameter_list_wipe(&a->parameter); a->parameter = b->parameter; @@ -155,10 +141,9 @@ int mutt_compose_attachment (BODY * a) /* Remove headers by copying out data to another file, then * copying the file back */ fseeko (fp, b->offset, 0); - mutt_mktemp (tempfile); - if ((tfp = safe_fopen (tempfile, "w")) == NULL) { + tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + if (!tfp) { mutt_perror (_("Failure to open file to strip headers.")); - goto bailout; } mutt_copy_stream (fp, tfp); @@ -465,9 +450,9 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, /* recv case */ m_strcpy(pagerfile, sizeof(pagerfile), a->filename); mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile)); - } - else + } else { mutt_mktemp (pagerfile); + } } if (use_mailcap) {