projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
safe_fclose -> m_fclose, and is now inlined.
[apps/madmutt.git]
/
attach.c
diff --git
a/attach.c
b/attach.c
index
9114d86
..
1d1ce66
100644
(file)
--- a/
attach.c
+++ b/
attach.c
@@
-450,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));
/* recv case */
m_strcpy(pagerfile, sizeof(pagerfile), a->filename);
mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile));
- }
- else
+ } else {
mutt_mktemp (pagerfile);
mutt_mktemp (pagerfile);
+ }
}
if (use_mailcap) {
}
if (use_mailcap) {
@@
-614,7
+614,7
@@
int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
s.fpin = fp;
mutt_decode_attachment (b, &s);
s.fpin = fp;
mutt_decode_attachment (b, &s);
-
safe_fclose
(&s.fpout);
+
m_fclose
(&s.fpout);
}
else {
/* send case */
}
else {
/* send case */
@@
-638,13
+638,13
@@
int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path,
if (thepid < 0) {
mutt_perror (_("Can't create filter"));
if (thepid < 0) {
mutt_perror (_("Can't create filter"));
-
safe_fclose
(&ifp);
+
m_fclose
(&ifp);
goto bail;
}
mutt_copy_stream (ifp, ofp);
goto bail;
}
mutt_copy_stream (ifp, ofp);
-
safe_fclose
(&ofp);
-
safe_fclose
(&ifp);
+
m_fclose
(&ofp);
+
m_fclose
(&ifp);
}
rv = 1;
}
rv = 1;
@@
-760,19
+760,19
@@
int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
if ((nfp = mutt_save_attachment_open (path, flags)) == NULL) {
mutt_perror ("fopen");
if ((nfp = mutt_save_attachment_open (path, flags)) == NULL) {
mutt_perror ("fopen");
-
safe_fclose
(&ofp);
+
m_fclose
(&ofp);
return (-1);
}
if (mutt_copy_stream (ofp, nfp) == -1) {
mutt_error _("Write fault!");
return (-1);
}
if (mutt_copy_stream (ofp, nfp) == -1) {
mutt_error _("Write fault!");
-
safe_fclose
(&ofp);
-
safe_fclose
(&nfp);
+
m_fclose
(&ofp);
+
m_fclose
(&nfp);
return (-1);
}
return (-1);
}
-
safe_fclose
(&ofp);
-
safe_fclose
(&nfp);
+
m_fclose
(&ofp);
+
m_fclose
(&nfp);
}
return 0;
}
return 0;
@@
-915,12
+915,12
@@
int mutt_print_attachment (FILE * fp, BODY * a)
mutt_perror (_("Can't create filter"));
rfc1524_entry_delete(&entry);
mutt_perror (_("Can't create filter"));
rfc1524_entry_delete(&entry);
-
safe_fclose
(&ifp);
+
m_fclose
(&ifp);
return 0;
}
mutt_copy_stream (ifp, fpout);
return 0;
}
mutt_copy_stream (ifp, fpout);
-
safe_fclose
(&fpout);
-
safe_fclose
(&ifp);
+
m_fclose
(&fpout);
+
m_fclose
(&ifp);
if (mutt_wait_filter (thepid) || option (OPTWAITKEY))
mutt_any_key_to_continue (NULL);
}
if (mutt_wait_filter (thepid) || option (OPTWAITKEY))
mutt_any_key_to_continue (NULL);
}
@@
-968,16
+968,16
@@
int mutt_print_attachment (FILE * fp, BODY * a)
mutt_copy_stream (ifp, fpout);
mutt_copy_stream (ifp, fpout);
-
safe_fclose
(&fpout);
-
safe_fclose
(&ifp);
+
m_fclose
(&fpout);
+
m_fclose
(&ifp);
if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY))
mutt_any_key_to_continue (NULL);
rc = 1;
}
bail0:
if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY))
mutt_any_key_to_continue (NULL);
rc = 1;
}
bail0:
-
safe_fclose
(&ifp);
-
safe_fclose
(&fpout);
+
m_fclose
(&ifp);
+
m_fclose
(&fpout);
mutt_unlink (newfile);
return rc;
}
mutt_unlink (newfile);
return rc;
}