else
mutt_perror(fpin ? tempfile : a->filename);
- if (fpin)
- fclose (fpin);
- if (fpout)
- fclose (fpout);
+ m_fclose(&fpin);
+ m_fclose(&fpout);
return a->unlink ? 0 : -1;
}
goto bailout;
}
mutt_copy_stream (fp, tfp);
- fclose (fp);
- fclose (tfp);
+ m_fclose(&fp);
+ m_fclose(&tfp);
mutt_unlink (a->filename);
if (mutt_rename_file (tempfile, a->filename) != 0) {
mutt_perror (_("Failure to rename file."));
rfc1524_entry *entry = NULL;
int rc = -1;
int unlink_tempfile = 0;
+ int pagerfd = -1;
is_message = mutt_is_message_type (a->type, a->subtype);
if (is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
if (fp && !use_mailcap && a->filename) {
/* recv case */
m_strcpy(pagerfile, sizeof(pagerfile), a->filename);
- mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile));
+ pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(Tempdir), pagerfile);
} else {
- mutt_mktemp (pagerfile);
+ pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(Tempdir), NULL);
}
}
if (use_mailcap) {
pid_t thepid = 0;
- int tempfd = -1, pagerfd = -1;
+ int tempfd = -1;
if (!use_pager)
mutt_endwin (NULL);
if (use_pager || use_pipe) {
- if (use_pager
- && ((pagerfd = safe_open (pagerfile, O_CREAT | O_EXCL | O_WRONLY))
- == -1)) {
+ if (use_pager && pagerfd == -1) {
mutt_perror ("open");
goto return_error;
}
fseeko ((s.fpin = fp), m->offset, 0);
mutt_decode_attachment (m, &s);
- if (fclose (s.fpout) != 0) {
+ if (m_fclose(&s.fpout) != 0) {
mutt_perror ("fclose");
return (-1);
}
}
- }
- else {
+ } else {
/* In send mode, just copy file */
FILE *ofp, *nfp;
if (stat (m->filename, &st) == -1) {
mutt_perror ("stat");
- fclose (s.fpout);
+ m_fclose(&s.fpout);
return (-1);
}
mutt_body_handler (m, &s);
- fclose (s.fpout);
+ m_fclose(&s.fpout);
if (fp == NULL) {
m->length = 0;
m->encoding = saved_encoding;
m->parts = saved_parts;
m->hdr = saved_hdr;
}
- fclose (s.fpin);
+ m_fclose(&s.fpin);
}
return (0);
p++;
}
}
- fclose (fp);
+ m_fclose(&fp);
return (found);
}