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]
/
nntp
/
nntp.c
diff --git
a/nntp/nntp.c
b/nntp/nntp.c
index
e24857a
..
a2388d9
100644
(file)
--- a/
nntp/nntp.c
+++ b/
nntp/nntp.c
@@
-14,10
+14,10
@@
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
#include <lib-ui/sidebar.h>
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
#include <lib-ui/sidebar.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "sort.h"
#include "mutt.h"
#include "sort.h"
-#include "mx.h"
#include "nntp.h"
#include "buffy.h"
#include "nntp.h"
#include "buffy.h"
@@
-437,8
+437,8
@@
static int nntp_read_header (CONTEXT * ctx, const char *msgid,
int ret;
HEADER *h = ctx->hdrs[ctx->msgcount];
int ret;
HEADER *h = ctx->hdrs[ctx->msgcount];
-
mutt_mktemp (tempfile
);
- if (!
(f = safe_fopen (tempfile, "w+"))
)
+
f = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (!
f
)
return -1;
if (!msgid)
return -1;
if (!msgid)
@@
-915,12
+915,11
@@
int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
p_delete(&cache->path);
cache->index = ctx->hdrs[msgno]->index;
p_delete(&cache->path);
cache->index = ctx->hdrs[msgno]->index;
- mutt_mktemp (path);
- cache->path = m_strdup(path);
- if (!(msg->fp = safe_fopen (path, "w+"))) {
- p_delete(&cache->path);
+ msg->fp = m_tempfile(path, sizeof(path), NONULL(Tempdir), NULL);
+ if (!msg->fp) {
return -1;
}
return -1;
}
+ cache->path = m_strdup(path);
if (ctx->hdrs[msgno]->article_num == 0)
snprintf (buf, sizeof (buf), "ARTICLE %s\r\n",
if (ctx->hdrs[msgno]->article_num == 0)
snprintf (buf, sizeof (buf), "ARTICLE %s\r\n",