Changeset 5046:eabef30c9344 for imap/imap.c

Timestamp:

2007-04-02 14:33:29 (22 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Fix a segfault in the new mboxcache hcache lookup.
idata may not have an associated context, so the cache path must use
the account info instead. For harmony with the other hcache callers,
make them all canonify the path the same way with imap_hcache_open.

Files:

• imap/imap.c (modified) (4 diffs)

imap/imap.c

@@ -252 +252 @@
   header_cache_t *hc;
   char uidbuf[32];
-  
-  hc = mutt_hcache_open (HeaderCache, idata->ctx->path);
+
+  hc = imap_hcache_open (idata, idata->ctx->path);
 #endif
 
@@ -1158 +1158 @@
 #if USE_HCACHE
   if (expunge && ctx->closing)
-    hc = mutt_hcache_open (HeaderCache, idata->ctx->path);
+    hc = imap_hcache_open (idata, idata->ctx->path);
 #endif
 
@@ -1583 +1583 @@
   unsigned int *uidvalidity = NULL;
   unsigned int *uidnext = NULL;
-  char* path;
 #endif
   
@@ -1607 +1606 @@
 
 #ifdef USE_HCACHE
-  path = safe_strdup (idata->ctx->path);
-  url_parse_ciss (&url, path);
+  mutt_account_tourl (&idata->conn->account, &url);
   url.path = (char*)mbox;
   url_ciss_tostring (&url, urlstr, sizeof (urlstr), 0);
-  FREE (&path);
   hc = mutt_hcache_open (HeaderCache, urlstr);
   if (hc)