projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move more functions in file.c
[apps/madmutt.git]
/
commands.c
diff --git
a/commands.c
b/commands.c
index
85ff46a
..
d8a10d7
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-69,7
+69,7
@@
int mutt_display_message (HEADER * cur)
-1, fileno (fpfilterout), -1);
if (filterpid < 0) {
mutt_error (_("Cannot create display filter"));
-1, fileno (fpfilterout), -1);
if (filterpid < 0) {
mutt_error (_("Cannot create display filter"));
-
safe_fclose
(&fpfilterout);
+
m_fclose
(&fpfilterout);
unlink (tempfile);
return 0;
}
unlink (tempfile);
return 0;
}
@@
-128,11
+128,11
@@
int mutt_display_message (HEADER * cur)
mx_close_message (&msg);
}
mx_close_message (&msg);
}
- if ((
safe_fclose
(&fpout) != 0 && errno != EPIPE) || res == -1) {
+ if ((
m_fclose
(&fpout) != 0 && errno != EPIPE) || res == -1) {
mutt_error (_("Could not copy message"));
if (fpfilterout != NULL) {
mutt_wait_filter (filterpid);
mutt_error (_("Could not copy message"));
if (fpfilterout != NULL) {
mutt_wait_filter (filterpid);
-
safe_fclose
(&fpfilterout);
+
m_fclose
(&fpfilterout);
}
#if 0
/* this is maybe just plain wrong but it makes the pager display
}
#if 0
/* this is maybe just plain wrong but it makes the pager display
@@
-149,7
+149,7
@@
int mutt_display_message (HEADER * cur)
if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0)
mutt_any_key_to_continue (NULL);
if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0)
mutt_any_key_to_continue (NULL);
-
safe_fclose
(&fpfilterout); /* XXX - check result? */
+
m_fclose
(&fpfilterout); /* XXX - check result? */
/* update crypto information for this message */
/* update crypto information for this message */
@@
-356,7
+356,7
@@
static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
}
pipe_msg (h, fpout, decode, print);
}
pipe_msg (h, fpout, decode, print);
-
fclose (
fpout);
+
m_fclose(&
fpout);
rc = mutt_wait_filter (thepid);
}
else { /* handle tagged messages */
rc = mutt_wait_filter (thepid);
}
else { /* handle tagged messages */
@@
-389,7
+389,7
@@
static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
/* add the message separator */
if (sep)
fputs (sep, fpout);
/* add the message separator */
if (sep)
fputs (sep, fpout);
-
safe_fclose
(&fpout);
+
m_fclose
(&fpout);
if (mutt_wait_filter (thepid) != 0)
rc = 1;
}
if (mutt_wait_filter (thepid) != 0)
rc = 1;
}
@@
-412,7
+412,7
@@
static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
fputs (sep, fpout);
}
}
fputs (sep, fpout);
}
}
-
safe_fclose
(&fpout);
+
m_fclose
(&fpout);
if (mutt_wait_filter (thepid) != 0)
rc = 1;
}
if (mutt_wait_filter (thepid) != 0)
rc = 1;
}