/* Don't use mailcap; the attachment is viewed in the pager */
if (flag == M_AS_TEXT) {
+ unlink(pagerfile);
+ close(pagerfd);
/* just let me see the raw data */
if (mutt_save_attachment (fp, a, pagerfile, 0, NULL))
goto return_error;
/* Use built-in handler */
set_option (OPTVIEWATTACH); /* disable the "use 'v' to view this part"
* message in case of error */
- if (mutt_decode_save_attachment (fp, a, pagerfile, M_DISPLAY, 0)) {
+ if (mutt_decode_save_attachment (fp, a, pagerfd, M_DISPLAY)) {
unset_option (OPTVIEWATTACH);
goto return_error;
}
/* returns 1 on success, 0 on error */
int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
- char *outfile)
+ int out)
{
pid_t thepid;
- int out = -1;
int rv = 0;
- if (outfile && *outfile)
- if ((out = safe_open (outfile, O_CREAT | O_EXCL | O_WRONLY)) < 0) {
- mutt_perror ("open");
- return 0;
- }
-
mutt_endwin (NULL);
if (fp) {
STATE s;
p_clear(&s, 1);
- if (outfile && *outfile)
+ if (out)
thepid = mutt_create_filter_fd(path, &s.fpout, NULL, NULL, -1, out, -1);
else
thepid = mutt_create_filter(path, &s.fpout, NULL, NULL);
if ((ifp = fopen (b->filename, "r")) == NULL) {
mutt_perror ("fopen");
- if (outfile && *outfile) {
- close (out);
- unlink (outfile);
- }
return 0;
}
- if (outfile && *outfile)
+ if (out)
thepid = mutt_create_filter_fd (path, &ofp, NULL, NULL, -1, out, -1);
else
thepid = mutt_create_filter (path, &ofp, NULL, NULL);
bail:
- if (outfile && *outfile)
+ if (out)
close (out);
/*
}
/* returns 0 on success, -1 on error */
-int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path,
- int displaying, int flags)
+int mutt_decode_save_attachment (FILE * fp, BODY * m, int pathfd,
+ int displaying)
{
STATE s;
unsigned int saved_encoding = 0;
p_clear(&s, 1);
s.flags = displaying;
-
- if (flags == M_SAVE_APPEND)
- s.fpout = fopen (path, "a");
- else
- s.fpout = safe_fopen (path, "w");
+ s.fpout = fdopen (pathfd, "w");
if (s.fpout == NULL) {
+ close(pathfd);
mutt_perror ("fopen");
return (-1);
}
tok = mime_which_token(type, -1);
if (tok == MIME_TEXT_PLAIN || tok == MIME_APPLICATION_POSTSCRIPT) {
- return (mutt_pipe_attachment (fp, a, NONULL (PrintCmd), NULL));
+ return (mutt_pipe_attachment (fp, a, NONULL (PrintCmd), 0));
}
- else if (mutt_can_decode (a)) {
+
+ if (mutt_can_decode (a)) {
/* decode and print */
int rc = 0;
+ int newfile_fd = 0;
ifp = NULL;
fpout = NULL;
- mutt_mktemp (newfile);
- if (mutt_decode_save_attachment (fp, a, newfile, M_PRINTING, 0) == 0) {
+ newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(Tempdir), NULL);
+ if (mutt_decode_save_attachment (fp, a, newfile_fd, M_PRINTING) == 0) {
- if ((ifp = fopen (newfile, "r")) == NULL) {
+ if ((ifp = fopen(newfile, "r")) == NULL) {
mutt_perror ("fopen");
goto bail0;
}
goto bail0;
}
- mutt_copy_stream (ifp, fpout);
-
+ mutt_copy_stream(ifp, fpout);
m_fclose(&fpout);
m_fclose(&ifp);
m_fclose(&fpout);
mutt_unlink (newfile);
return rc;
- }
- else {
+ } else {
mutt_error _("I don't know how to print that!");
return 0;