#include "mutt.h"
#include "globals.h"
+#include "pattern.h"
#include "sort.h"
#include "browser.h"
#include "message.h"
return -1;
}
-#if 1
if (r == 1 && c != '\n')
fputc ('\r', fp);
}
else
r = 0;
-#endif
+
fputc (c, fp);
if (bar && !(pos % 1024))
mutt_progress_bar (bar, pos);
if (idata->state == IMAP_CONNECTED) {
if (!imap_authenticate (idata)) {
idata->state = IMAP_AUTHENTICATED;
- }
- else
+ } else {
mutt_account_unsetpass (&idata->conn->account);
+ }
p_delete(&idata->capstr);
}
CONTEXT * dest __attribute__ ((unused)),
HEADER * hdr __attribute__ ((unused)))
{
- char tmp[_POSIX_PATH_MAX];
+ char tmp[_POSIX_PATH_MAX];
- mutt_mktemp (tmp);
- if ((msg->fp = safe_fopen (tmp, "w")) == NULL) {
- mutt_perror (tmp);
- return (-1);
- }
- msg->path = m_strdup(tmp);
- return 0;
+ msg->fp = m_tempfile(tmp, sizeof(tmp), NONULL(Tempdir), NULL);
+ if (!msg->fp) {
+ mutt_perror(tmp);
+ return -1;
+ }
+
+ msg->path = m_strdup(tmp);
+ return 0;
}
/* this ugly kludge is required since the last int to
static int imap_commit_message (MESSAGE* msg, CONTEXT* ctx) {
int r = 0;
- if ((r = safe_fclose (&msg->fp)) == 0)
+ if ((r = m_fclose(&msg->fp)) == 0)
r = imap_append_message (ctx, msg);
return (r);
}