if (a->stamp >= st.st_mtime)
mutt_stamp_attachment (a);
- }
- else
+ } else {
mutt_perror(fpin ? tempfile : a->filename);
+ }
m_fclose(&fpin);
m_fclose(&fpout);
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
!= M_YES)
goto bailout;
- }
- else
+ } else {
unlink_newfile = 1;
- }
- else
+ }
+ } else {
m_strcpy(newfile, sizeof(newfile), a->filename);
+ }
if (rfc1524_expand_command (a, newfile, type,
command, sizeof (command))) {
/* For now, editing requires a file, no piping */
mutt_error _("Mailcap compose entry requires %%s");
- }
- else {
+ } else {
int r;
mutt_endwin (NULL);
/* Remove headers by copying out data to another file, then
* copying the file back */
fseeko (fp, b->offset, 0);
- tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
if (!tfp) {
mutt_perror (_("Failure to open file to strip headers."));
goto bailout;
}
}
}
- }
- else {
+ } else {
rfc1524_entry_delete(&entry);
mutt_message (_("No mailcap compose entry for %s, creating empty file."),
type);
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
!= M_YES)
goto bailout;
- }
- else
+ } else {
unlink_newfile = 1;
- }
- else
+ }
+ } else {
m_strcpy(newfile, sizeof(newfile), a->filename);
+ }
if (rfc1524_expand_command (a, newfile, type,
command, sizeof (command))) {
/* For now, editing requires a file, no piping */
mutt_error _("Mailcap Edit entry requires %%s");
goto bailout;
- }
- else {
+ } else {
mutt_endwin (NULL);
if (mutt_system (command) == -1) {
mutt_error (_("Error running \"%s\"!"), command);
}
else if (a->type == TYPETEXT) {
/* On text, default to editor */
- mutt_edit_file (NONULL (Editor), a->filename);
- }
- else {
+ mutt_edit_file(a->filename);
+ } else {
rfc1524_entry_delete(&entry);
mutt_error (_("No mailcap edit entry for %s"), type);
return 0;
if (*(q + 1) == '*') {
if (ascii_strncasecmp (buf, p, q - p) == 0)
return (1);
- }
- else {
+ } else {
if (ascii_strcasecmp (buf, p) == 0)
return (1);
}
- }
- else {
+ } else {
lng = m_strlen(p);
if (buf[lng] == '/' && m_strncasecmp(buf, p, lng) == 0)
return (1);
int mutt_is_autoview (BODY * b, const char *type)
{
string_list_t *t = AutoViewList;
- char _type[SHORT_STRING];
+ char _type[STRING];
int i;
if (!type)
- snprintf (_type, sizeof (_type), "%s/%s", TYPE (b), b->subtype);
+ snprintf(_type, sizeof(_type), "%s/%s", TYPE(b), b->subtype);
else
m_strcpy(_type, sizeof(_type), type);
int unlink_tempfile = 0;
int pagerfd = -1;
- is_message = mutt_is_message_type (a->type, a->subtype);
+ is_message = mutt_is_message_type(a);
if (is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
!crypt_valid_passphrase (a->hdr->security))
return (rc);
if (use_pager) {
/* recv case */
- pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(Tempdir),
+ pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(MCore.tmpdir),
fp && !use_mailcap ? a->filename : NULL);
}
/* 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 mutt_pipe_attachment(FILE * fp, BODY * b, const char *path, 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 >= 0)
thepid = mutt_create_filter_fd(path, &s.fpout, NULL, NULL, -1, out, -1);
else
thepid = mutt_create_filter(path, &s.fpout, NULL, NULL);
s.fpin = fp;
mutt_decode_attachment (b, &s);
m_fclose(&s.fpout);
- }
- else {
+ } else {
/* send case */
FILE *ifp, *ofp;
if ((ifp = fopen (b->filename, "r")) == NULL) {
mutt_perror ("fopen");
- if (outfile && *outfile) {
- close (out);
- unlink (outfile);
- }
return 0;
}
- if (outfile && *outfile)
- thepid = mutt_create_filter_fd (path, &ofp, NULL, NULL, -1, out, -1);
+ if (out >= 0)
+ thepid = mutt_create_filter_fd(path, &ofp, NULL, NULL, -1, out, -1);
else
- thepid = mutt_create_filter (path, &ofp, NULL, NULL);
+ thepid = mutt_create_filter(path, &ofp, NULL, NULL);
if (thepid < 0) {
mutt_perror (_("Can't create filter"));
bail:
- if (outfile && *outfile)
- close (out);
+ if (out >= 0)
+ close(out);
/*
* check for error exit from child process
*/
- if (mutt_wait_filter (thepid) != 0)
+ if (mutt_wait_filter(thepid) != 0)
rv = 0;
- if (rv == 0 || option (OPTWAITKEY))
+ if (rv == 0 || option(OPTWAITKEY))
mutt_any_key_to_continue (NULL);
return rv;
}
m->hdr &&
m->encoding != ENCBASE64 &&
m->encoding != ENCQUOTEDPRINTABLE &&
- mutt_is_message_type (m->type, m->subtype)) {
+ mutt_is_message_type(m)) {
/* message type attachments are written to mail folders. */
char buf[HUGE_STRING];
}
/* 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);
}
pid_t thepid;
FILE *ifp, *fpout;
short unlink_newfile = 0;
+ int tok;
snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
return (1);
}
- if (!ascii_strcasecmp ("text/plain", type) ||
- !ascii_strcasecmp ("application/postscript", type)) {
- return (mutt_pipe_attachment (fp, a, NONULL (PrintCmd), NULL));
+ tok = mime_which_token(type, -1);
+ if (tok == MIME_TEXT_PLAIN || tok == MIME_APPLICATION_POSTSCRIPT) {
+ return mutt_pipe_attachment(fp, a, NONULL (PrintCmd), -1);
}
- 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(MCore.tmpdir), 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;
projects / apps / madmutt.git / blobdiff