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
+ hc = mutt_hcache_open (HeaderCache, ctx->path);
+
snprintf (buf, sizeof (buf),
"FETCH %d:%d (UID FLAGS)", msgbegin + 1, msgend + 1);
fetchlast = msgend + 1;
(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] = mutt_hcache_restore((unsigned char *) uid_validity, 0);
ctx->hdrs[msgno]->index = h.sid - 1;
if (h.sid != ctx->msgcount + 1)
- debug_print (1, ("msgcount and sequence ID are inconsistent!\n"));
+ 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->msgcount++;
}
+
rewind (fp);
FREE (&uid_validity);
{
IMAP_DATA *idata;
HEADER *h;
+ ENVELOPE* newenv;
char buf[LONG_STRING];
char path[_POSIX_PATH_MAX];
char *pc;
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);
}
/* 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. */
#if USE_HCACHE
static size_t imap_hcache_keylen (const char *fn)
{
- return safe_strlen (fn);
+ return mutt_strlen (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, mutt_strlen (flag_list->data)))
return 1;
flag_list = flag_list->next;