#include <ctype.h>
#include "mutt.h"
+#include "ascii.h"
+#include "buffer.h"
#include "mutt_curses.h"
#include "imap_private.h"
#include "message.h"
#include "mx.h"
+#include "hcache.h"
#ifdef HAVE_PGP
#include "pgp.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#if HAVE_STDINT_H
#include <stdint.h>
ctx = idata->ctx;
-#if USE_HCACHE
- hc = mutt_hcache_open (HeaderCache, ctx->path);
-#endif /* USE_HCACHE */
-
if (mutt_bit_isset (idata->capabilities, IMAP4REV1)) {
snprintf (hdrreq, sizeof (hdrreq), "BODY.PEEK[HEADER.FIELDS (%s%s%s)]",
want_headers, ImapHeaders ? " " : "",
mutt_error _("Unable to fetch headers from this IMAP server version.");
mutt_sleep (2); /* pause a moment to let the user see the error */
-#if USE_HCACHE
- mutt_hcache_close (hc);
-#endif /* USE_HCACHE */
return -1;
}
if (!(fp = safe_fopen (tempfile, "w+"))) {
mutt_error (_("Could not create temporary file %s"), tempfile);
mutt_sleep (2);
-#if USE_HCACHE
- mutt_hcache_close (hc);
-#endif /* USE_HCACHE */
return -1;
}
unlink (tempfile);
idata->newMailCount = 0;
#if USE_HCACHE
- snprintf (buf, sizeof (buf),
- "FETCH %d:%d (UID FLAGS)", msgbegin + 1, msgend + 1);
- fetchlast = msgend + 1;
+ if ((hc = mutt_hcache_open (HeaderCache, ctx->path))) {
- imap_cmd_start (idata, buf);
+ snprintf (buf, sizeof (buf),
+ "FETCH %d:%d (UID FLAGS)", msgbegin + 1, msgend + 1);
+ fetchlast = msgend + 1;
- for (msgno = msgbegin; msgno <= msgend; msgno++) {
- if (ReadInc && (!msgno || ((msgno + 1) % ReadInc == 0)))
- mutt_message (_("Evaluating cache... [%d/%d]"), msgno + 1, msgend + 1);
+ imap_cmd_start (idata, buf);
- rewind (fp);
- memset (&h, 0, sizeof (h));
- h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
- do {
- mfhrc = 0;
+ for (msgno = msgbegin; msgno <= msgend; msgno++) {
+ if (ReadInc && (!msgno || ((msgno + 1) % ReadInc == 0)))
+ mutt_message (_("Evaluating cache... [%d/%d]"), msgno + 1, msgend + 1);
- rc = imap_cmd_step (idata);
- if (rc != IMAP_CMD_CONTINUE)
- break;
+ rewind (fp);
+ memset (&h, 0, sizeof (h));
+ h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+ do {
+ mfhrc = 0;
+
+ rc = imap_cmd_step (idata);
+ if (rc != IMAP_CMD_CONTINUE)
+ break;
+
+ if ((mfhrc =
+ msg_fetch_header_fetch (idata->ctx, &h, idata->cmd.buf, fp)) == -1)
+ continue;
+ else if (mfhrc < 0)
+ break;
+
+ /* make sure we don't get remnants from older larger message headers */
+ fputs ("\n\n", fp);
+
+ sprintf (uid_buf, "/%u", h.data->uid); /* XXX --tg 21:41 04-07-11 */
+ uid_validity =
+ (unsigned long *) mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen);
+
+ if (uid_validity != NULL && *uid_validity == idata->uid_validity) {
+ ctx->hdrs[msgno] = mutt_hcache_restore((unsigned char *) uid_validity, 0);
+ ctx->hdrs[msgno]->index = h.sid - 1;
+ if (h.sid != ctx->msgcount + 1)
+ debug_print (1, ("imap_read_headers: msgcount and sequence ID are inconsistent!"));
+ /* messages which have not been expunged are ACTIVE (borrowed from mh
+ * folders) */
+ ctx->hdrs[msgno]->active = 1;
+ ctx->hdrs[msgno]->read = h.read;
+ ctx->hdrs[msgno]->old = h.old;
+ ctx->hdrs[msgno]->deleted = h.deleted;
+ ctx->hdrs[msgno]->flagged = h.flagged;
+ ctx->hdrs[msgno]->replied = h.replied;
+ ctx->hdrs[msgno]->changed = h.changed;
+ /* ctx->hdrs[msgno]->received is restored from mutt_hcache_restore */
+ ctx->hdrs[msgno]->data = (void *) (h.data);
+
+ ctx->msgcount++;
+ }
- if ((mfhrc =
- msg_fetch_header_fetch (idata->ctx, &h, idata->cmd.buf, fp)) == -1)
- continue;
- else if (mfhrc < 0)
- break;
+ rewind (fp);
- /* make sure we don't get remnants from older larger message headers */
- fputs ("\n\n", fp);
+ mem_free (&uid_validity);
- sprintf (uid_buf, "/%u", h.data->uid); /* XXX --tg 21:41 04-07-11 */
- uid_validity =
- (unsigned long *) mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen);
-
- if (uid_validity != NULL && *uid_validity == idata->uid_validity) {
- ctx->hdrs[msgno] =
- mutt_hcache_restore ((unsigned char *) uid_validity, 0);
- ctx->hdrs[msgno]->index = h.sid - 1;
- if (h.sid != ctx->msgcount + 1)
- dprint (1,
- (debugfile,
- "imap_read_headers: msgcount and sequence ID are inconsistent!"));
- /* messages which have not been expunged are ACTIVE (borrowed from mh
- * folders) */
- ctx->hdrs[msgno]->active = 1;
- ctx->hdrs[msgno]->read = h.read;
- ctx->hdrs[msgno]->old = h.old;
- ctx->hdrs[msgno]->deleted = h.deleted;
- ctx->hdrs[msgno]->flagged = h.flagged;
- ctx->hdrs[msgno]->replied = h.replied;
- ctx->hdrs[msgno]->changed = h.changed;
- /* ctx->hdrs[msgno]->received is restored from mutt_hcache_restore */
- ctx->hdrs[msgno]->data = (void *) (h.data);
-
- ctx->msgcount++;
}
- rewind (fp);
-
- FREE (&uid_validity);
+ while ((rc != IMAP_CMD_OK) && ((mfhrc == -1) ||
+ ((msgno + 1) >= fetchlast)));
+ if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK))) {
+ imap_free_header_data ((void **) &h.data);
+ fclose (fp);
+ mutt_hcache_close (hc);
+ return -1;
+ }
}
- while ((rc != IMAP_CMD_OK) && ((mfhrc == -1) ||
- ((msgno + 1) >= fetchlast)));
- if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK))) {
- imap_free_header_data ((void **) &h.data);
- fclose (fp);
- mutt_hcache_close (hc);
- return -1;
- }
+ fetchlast = msgbegin;
}
-
- fetchlast = msgbegin;
#endif /* USE_HCACHE */
for (msgno = msgbegin; msgno <= msgend; msgno++) {
/* freshen fp, h */
rewind (fp);
memset (&h, 0, sizeof (h));
- h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
+ h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
/* this DO loop does two things:
* 1. handles untagged messages, so we can try again on the same msg
ctx->hdrs[msgno]->index = h.sid - 1;
if (h.sid != ctx->msgcount + 1)
- dprint (1,
- (debugfile,
- "imap_read_headers: msgcount and sequence ID are inconsistent!"));
+ debug_print (1, ("msgcount and sequence ID are inconsistent!\n"));
/* messages which have not been expunged are ACTIVE (borrowed from mh
* folders) */
ctx->hdrs[msgno]->active = 1;
((msgno + 1) >= fetchlast)));
if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK))) {
- imap_free_header_data ((void **) &h.data);
+ imap_free_header_data ((void *)&h.data);
fclose (fp);
#if USE_HCACHE
mutt_hcache_close (hc);
{
IMAP_DATA *idata;
HEADER *h;
+ ENVELOPE* newenv;
char buf[LONG_STRING];
char path[_POSIX_PATH_MAX];
char *pc;
IMAP_CACHE *cache;
int read;
int rc;
+ progress_t bar;
/* Sam's weird courier server returns an OK response even when FETCH
* fails. Thanks Sam. */
cache = &idata->cache[cacheno];
if (cache->path) {
- if (cache->uid == HEADER_DATA (h)->uid) {
- /* yes, so just return a pointer to the message */
- if (!(msg->fp = fopen (cache->path, "r"))) {
- mutt_perror (cache->path);
- return (-1);
- }
+ /* don't treat cache errors as fatal, just fall back. */
+ if (cache->uid == HEADER_DATA(h)->uid && (msg->fp = fopen (cache->path, "r")))
return 0;
- }
else {
- /* clear the previous entry */
unlink (cache->path);
- FREE (&cache->path);
+ mem_free (&cache->path);
}
}
cache->uid = HEADER_DATA (h)->uid;
mutt_mktemp (path);
- cache->path = safe_strdup (path);
+ cache->path = str_dup (path);
if (!(msg->fp = safe_fopen (path, "w+"))) {
- FREE (&cache->path);
+ mem_free (&cache->path);
return -1;
}
imap_error ("imap_fetch_message()", buf);
goto bail;
}
- if (imap_read_literal (msg->fp, idata, bytes) < 0)
+ bar.size = bytes;
+ bar.msg = _("Fetching message...");
+ mutt_progress_bar (&bar, 0);
+ if (imap_read_literal (msg->fp, idata, bytes, &bar) < 0)
goto bail;
/* pick up trailing line */
if ((rc = imap_cmd_step (idata)) != IMAP_CMD_CONTINUE)
/* see comment before command start. */
h->active = 1;
+ fflush (msg->fp);
+ if (ferror (msg->fp)) {
+ mutt_perror (cache->path);
+ goto bail;
+ }
+
if (rc != IMAP_CMD_OK)
goto bail;
* picked up in mutt_read_rfc822_header, we mark the message (and context
* changed). Another possiblity: ignore Status on IMAP?*/
read = h->read;
- /* I hate do this here, since it's so low-level, but I'm not sure where
- * I can abstract it. Problem: the id and subj hashes lose their keys when
- * mutt_free_envelope gets called, but keep their spots in the hash. This
- * confuses threading. Alternatively we could try to merge the new
- * envelope into the old one. Also messy and lowlevel. */
- if (ctx->id_hash && h->env->message_id)
- hash_delete (ctx->id_hash, h->env->message_id, h, NULL);
- if (ctx->subj_hash && h->env->real_subj)
- hash_delete (ctx->subj_hash, h->env->real_subj, h, NULL);
- mutt_free_envelope (&h->env);
- h->env = mutt_read_rfc822_header (msg->fp, h, 0, 0);
- if (ctx->id_hash && h->env->message_id)
- hash_insert (ctx->id_hash, h->env->message_id, h, 0);
- if (ctx->subj_hash && h->env->real_subj)
- hash_insert (ctx->subj_hash, h->env->real_subj, h, 1);
+ newenv = mutt_read_rfc822_header (msg->fp, h, 0, 0);
+ mutt_merge_envelopes(h->env, &newenv);
/* see above. We want the new status in h->read, so we unset it manually
* and let mutt_set_flag set it correctly, updating context. */
fgets (buf, sizeof (buf), msg->fp);
}
- h->content->length = ftell (msg->fp) - h->content->offset;
+ h->content->length = ftello (msg->fp) - h->content->offset;
/* This needs to be done in case this is a multipart message */
#if defined(HAVE_PGP) || defined(HAVE_SMIME)
safe_fclose (&msg->fp);
if (cache->path) {
unlink (cache->path);
- FREE (&cache->path);
+ mem_free (&cache->path);
}
return -1;
int c, last;
IMAP_MBOX mx;
int rc;
+ progress_t bar;
+ size_t sent;
idata = (IMAP_DATA *) ctx->data;
}
rewind (fp);
+ bar.msg = _("Uploading message...");
+ bar.size = len;
+ mutt_progress_bar (&bar, 0);
+
imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
snprintf (buf, sizeof (buf), "APPEND %s (%s%s%s%s%s) {%lu}", mbox,
msg->flags.read ? "\\Seen" : "",
if (rc != IMAP_CMD_RESPOND) {
char *pc;
- dprint (1, (debugfile, "imap_append_message(): command failed: %s\n",
- idata->cmd.buf));
+ debug_print (1, ("command failed: %s\n", idata->cmd.buf));
pc = idata->cmd.buf + SEQLEN;
SKIPWS (pc);
goto fail;
}
- mutt_message _("Uploading message ...");
-
- for (last = EOF, len = 0; (c = fgetc (fp)) != EOF; last = c) {
+ for (last = EOF, sent = len = 0; (c = fgetc (fp)) != EOF; last = c) {
if (c == '\n' && last != '\r')
buf[len++] = '\r';
buf[len++] = c;
- if (len > sizeof (buf) - 3)
+ if (len > sizeof (buf) - 3) {
+ sent += len;
flush_buffer (buf, &len, idata->conn);
+ mutt_progress_bar (&bar, sent);
+ }
}
if (len)
if (!imap_code (idata->cmd.buf)) {
char *pc;
- dprint (1, (debugfile, "imap_append_message(): command failed: %s\n",
- idata->cmd.buf));
+ debug_print (1, ("command failed: %s\n", idata->cmd.buf));
pc = idata->cmd.buf + SEQLEN;
SKIPWS (pc);
pc = imap_next_word (pc);
goto fail;
}
- FREE (&mx.mbox);
+ mem_free (&mx.mbox);
return 0;
fail:
- FREE (&mx.mbox);
+ mem_free (&mx.mbox);
return -1;
}
idata = (IMAP_DATA *) ctx->data;
if (imap_parse_path (dest, &mx)) {
- dprint (1, (debugfile, "imap_copy_messages: bad destination %s\n", dest));
+ debug_print (1, ("bad destination %s\n", dest));
return -1;
}
/* check that the save-to folder is in the same account */
if (!mutt_account_match (&(CTX_DATA->conn->account), &(mx.account))) {
- dprint (3, (debugfile, "imap_copy_messages: %s not same server as %s\n",
- dest, ctx->path));
+ debug_print (3, ("%s not same server as %s\n", dest, ctx->path));
return 1;
}
if (h && h->attach_del) {
- dprint (3,
- (debugfile,
- "imap_copy_messages: Message contains attachments to be deleted\n"));
+ debug_print (3, ("Message contains attachments to be deleted\n"));
return 1;
}
* remainder. */
for (n = 0; n < ctx->msgcount; n++) {
if (ctx->hdrs[n]->tagged && ctx->hdrs[n]->attach_del) {
- dprint (3,
- (debugfile,
- "imap_copy_messages: Message contains attachments to be deleted\n"));
+ debug_print (3, ("Message contains attachments to be deleted\n"));
return 1;
}
rc = imap_sync_message (idata, ctx->hdrs[n], &sync_cmd, &err_continue);
if (rc < 0)
{
- dprint (1, (debugfile, "imap_copy_messages: could not sync\n"));
+ debug_print (1, ("could not sync\n"));
goto fail;
}
}
rc = imap_make_msg_set (idata, &cmd, M_TAG, 0);
if (!rc) {
- dprint (1, (debugfile, "imap_copy_messages: No messages tagged\n"));
+ debug_print (1, ("No messages tagged\n"));
goto fail;
}
mutt_message (_("Copying %d messages to %s..."), rc, mbox);
rc = imap_sync_message (idata, h, &sync_cmd, &err_continue);
if (rc < 0)
{
- dprint (1, (debugfile, "imap_copy_messages: could not sync\n"));
+ debug_print (1, ("could not sync\n"));
goto fail;
}
}
imap_error ("imap_copy_messages", idata->cmd.buf);
goto fail;
}
- dprint (2,
- (debugfile, "imap_copy_messages: server suggests TRYCREATE\n"));
+ debug_print (2, ("server suggests TRYCREATE\n"));
snprintf (mmbox, sizeof (mmbox), _("Create %s?"), mbox);
if (option (OPTCONFIRMCREATE) && mutt_yesorno (mmbox, 1) < 1) {
mutt_clear_error ();
}
if (cmd.data)
- FREE (&cmd.data);
+ mem_free (&cmd.data);
if (sync_cmd.data)
- FREE (&sync_cmd.data);
- FREE (&mx.mbox);
+ mem_free (&sync_cmd.data);
+ mem_free (&mx.mbox);
return 0;
fail:
if (cmd.data)
- FREE (&cmd.data);
+ mem_free (&cmd.data);
if (sync_cmd.data)
- FREE (&sync_cmd.data);
- FREE (&mx.mbox);
+ mem_free (&sync_cmd.data);
+ mem_free (&mx.mbox);
return -1;
}
while (keywords) {
if (msg_has_flag (mailbox_flags, keywords->data)) {
- safe_strcat (s, slen, keywords->data);
- safe_strcat (s, slen, " ");
+ str_cat (s, slen, keywords->data);
+ str_cat (s, slen, " ");
}
keywords = keywords->next;
}
/* this should be safe even if the list wasn't used */
mutt_free_list (&(((IMAP_HEADER_DATA *) * data)->keywords));
- FREE (data);
+ mem_free (data);
}
/* imap_set_flags: fill out the message header according to the flags from
unsigned char readonly;
memset (&newh, 0, sizeof (newh));
- newh.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
+ newh.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
- dprint (2, (debugfile, "imap_fetch_message: parsing FLAGS\n"));
+ debug_print (2, ("parsing FLAGS\n"));
if ((s = msg_parse_flags (&newh, s)) == NULL) {
- FREE (&newh.data);
+ mem_free (&newh.data);
return NULL;
}
mutt_free_list (&(HEADER_DATA (h)->keywords));
HEADER_DATA (h)->keywords = newh.data->keywords;
- FREE (&newh.data);
+ mem_free (&newh.data);
return s;
}
return rc;
if (imap_get_literal_count (buf, &bytes) == 0) {
- imap_read_literal (fp, idata, bytes);
+ imap_read_literal (fp, idata, bytes, NULL);
/* we may have other fields of the FETCH _after_ the literal
* (eg Domino puts FLAGS here). Nothing wrong with that, either.
#if USE_HCACHE
static size_t imap_hcache_keylen (const char *fn)
{
- return safe_strlen (fn);
+ return str_len (fn);
}
/* msg_fetch_header: import IMAP FETCH response into an IMAP_HEADER.
flag_list = flag_list->next;
while (flag_list) {
- if (!ascii_strncasecmp (flag_list->data, flag, safe_strlen (flag_list->data)))
+ if (!ascii_strncasecmp (flag_list->data, flag, str_len (flag_list->data)))
return 1;
flag_list = flag_list->next;
s += 12;
SKIPWS (s);
if (*s != '\"') {
- dprint (1,
- (debugfile,
- "msg_parse_fetch(): bogus INTERNALDATE entry: %s\n", s));
+ debug_print (1, ("bogus INTERNALDATE entry: %s\n", s));
return -1;
}
s++;
/* sanity-check string */
if (ascii_strncasecmp ("FLAGS", s, 5) != 0) {
- dprint (1, (debugfile, "msg_parse_flags: not a FLAGS response: %s\n", s));
+ debug_print (1, ("not a FLAGS response: %s\n", s));
return NULL;
}
s += 5;
SKIPWS (s);
if (*s != '(') {
- dprint (1, (debugfile, "msg_parse_flags: bogus FLAGS response: %s\n", s));
+ debug_print (1, ("bogus FLAGS response: %s\n", s));
return NULL;
}
s++;
s++;
}
else {
- dprint (1, (debugfile,
- "msg_parse_flags: Unterminated FLAGS response: %s\n", s));
+ debug_print (1, ("Unterminated FLAGS response: %s\n", s));
return NULL;
}
projects / apps / madmutt.git / blobdiff