#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);
* than getting the delim wrong */
idata->delim = '/';
- imap_cmd_start (idata, "string_list_t \"\" \"\"");
+ imap_cmd_start (idata, "LIST\"\" \"\"");
do {
if ((rc = imap_cmd_step (idata)) != IMAP_CMD_CONTINUE)
break;
s = imap_next_word (idata->cmd.buf);
- if (ascii_strncasecmp ("string_list_t", s, 4) == 0) {
+ if (ascii_strncasecmp ("LIST", s, 4) == 0) {
s = imap_next_word (s);
s = imap_next_word (s);
if (s && s[0] == '\"' && s[1] && s[2] == '\"')
return -1;
s = imap_next_word (idata->cmd.buf);
- if ((ascii_strncasecmp ("string_list_t", s, 4) == 0) ||
+ if ((ascii_strncasecmp ("LIST", s, 4) == 0) ||
(ascii_strncasecmp ("LSUB", s, 4) == 0)) {
*noselect = 0;
*noinferiors = 0;
/* fire off command */
snprintf (buf, sizeof (buf), "%s \"\" \"%s%%\"",
- option (OPTIMAPLSUB) ? "LSUB" : "string_list_t", list);
+ option (OPTIMAPLSUB) ? "LSUB" : "LIST", list);
imap_cmd_start (idata, buf);
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);
}