projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use m_strncmp instead of strncmp
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
42889e3
..
5fda6ce
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-15,6
+15,7
@@
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
#include <lib-sys/unix.h>
#include <lib-sys/unix.h>
@@
-22,11
+23,9
@@
#include "handler.h"
#include "sort.h"
#include "thread.h"
#include "handler.h"
#include "sort.h"
#include "thread.h"
-#include "mx.h"
#include <lib-crypt/crypt.h>
#include <imap/imap.h>
#include <lib-crypt/crypt.h>
#include <imap/imap.h>
-#include <imap/mx_imap.h>
static struct mapping_t PostponeHelp[] = {
{N_("Exit"), OP_EXIT},
static struct mapping_t PostponeHelp[] = {
{N_("Exit"), OP_EXIT},
@@
-605,11
+604,10
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
parameter_delval(&b->parameter, "x-mutt-noconv");
}
parameter_delval(&b->parameter, "x-mutt-noconv");
}
-
mutt_adv_mktemp (NULL, file, sizeof (file)
);
- if (
(s.fpout = safe_fopen (file, "w")) == NULL
)
+
s.fpout = m_tempfile(file, sizeof(file), NONULL(Tempdir), file
);
+ if (
!s.fpout
)
goto bail;
goto bail;
-
if (mutt_is_application_pgp (b) & (ENCRYPT | SIGN)) {
mutt_body_handler (b, &s);
if (mutt_is_application_pgp (b) & (ENCRYPT | SIGN)) {
mutt_body_handler (b, &s);
@@
-623,7
+621,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
else
mutt_decode_attachment (b, &s);
else
mutt_decode_attachment (b, &s);
- if (
safe_fclose
(&s.fpout) != 0)
+ if (
m_fclose
(&s.fpout) != 0)
goto bail;
m_strreplace(&b->filename, file);
goto bail;
m_strreplace(&b->filename, file);
@@
-657,7
+655,7
@@
bail:
/* that's it. */
if (bfp != fp)
/* that's it. */
if (bfp != fp)
-
fclose (
bfp);
+
m_fclose(&
bfp);
if (msg)
mx_close_message (&msg);
if (msg)
mx_close_message (&msg);