Changeset 5046:eabef30c9344

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.

Location:

imap

Files:

• imap.c (modified) (4 diffs)
• imap_private.h (modified) (1 diff)
• message.c (modified) (1 diff)
• util.c (modified) (1 diff)

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)

imap/imap_private.h

@@ -265 +265 @@
 
 /* util.c */
+#ifdef USE_HCACHE
+void* imap_hcache_open (IMAP_DATA* idata, const char* path);
+#endif
+
 int imap_continue (const char* msg, const char* resp);
 void imap_error (const char* where, const char* msg);

imap/message.c

@@ -123 +123 @@
 #if USE_HCACHE
   if (!msgbegin)
-    hc = mutt_hcache_open (HeaderCache, ctx->path);
+    hc = imap_hcache_open (idata, ctx->path);
 
   if (hc)

imap/util.c

@@ -67 +67 @@
 }
 
+#ifdef USE_HCACHE
+void* imap_hcache_open (IMAP_DATA* idata, const char* path)
+{
+  IMAP_MBOX mx;
+  ciss_url_t url;
+  char cachepath[LONG_STRING];
+
+  if (imap_parse_path (path, &mx) < 0)
+    return NULL;
+
+  mutt_account_tourl (&idata->conn->account, &url);
+  url.path = mx.mbox;
+  url_ciss_tostring (&url, cachepath, sizeof (cachepath), 0);
+  FREE (&mx.mbox);
+
+  return mutt_hcache_open (HeaderCache, cachepath);
+}
+#endif
+
 /* imap_parse_path: given an IMAP mailbox name, return host, port
  *   and a path IMAP servers will recognise.