if (stat (a->filename, &st) == -1)
return -1;
- if ((fpin = fopen (a->filename, "r")) && (fpout = safe_fopen (tempfile, "w"))) { /* __FOPEN_CHECKED__ */
+ if ((fpin = fopen (a->filename, "r")) && (fpout = safe_fopen (tempfile, "w"))) {
mutt_copy_stream (fpin, fpout);
m_strreplace(&a->filename, tempfile);
a->unlink = 1;
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);
}
}
}
- }
- 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 {
+ } 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);
rfc1524_entry *entry = NULL;
int rc = -1;
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) {
- if (fp && !use_mailcap && a->filename) {
- /* recv case */
- m_strcpy(pagerfile, sizeof(pagerfile), a->filename);
- mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile));
- } else {
- mutt_mktemp (pagerfile);
- }
+ /* recv case */
+ pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(Tempdir),
+ fp && !use_mailcap ? a->filename : 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;
}
* as safe_fopen returns w/ an error if path exists
*/
if (flags == M_SAVE_OVERWRITE)
- return fopen (path, "w"); /* __FOPEN_CHECKED__ */
+ return fopen (path, "w");
return safe_fopen (path, "w");
}
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];
if (flags == M_SAVE_APPEND)
s.fpout = fopen (path, "a");
- else if (flags == M_SAVE_OVERWRITE)
- s.fpout = safe_fopen (path, "w"); /* __FOPEN_CHECKED__ */
else
s.fpout = safe_fopen (path, "w");