Changeset 5115:8082e4c9f524

Timestamp:

2007-04-10 17:40:11 (21 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Make IMAP header cache layout match body cache.
You can now make them point to the same directory. Each folder will
have a folder.hcache file for the header cache.

Files:

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

hcache.c

@@ -468 +468 @@
                        hcache_namer_t namer)
 {
-  static char mutt_hcache_per_folder_path[_POSIX_PATH_MAX];
-  struct stat path_stat;
+  static char hcpath[_POSIX_PATH_MAX];
+  struct stat sb;
   MD5_CTX md5;
   unsigned char md5sum[16];
-  int ret;
-
-  ret = stat(path, &path_stat);
-  if (ret < 0)
+  char* s;
+  int ret, plen;
+
+  plen = mutt_strlen (path);
+
+  ret = stat(path, &sb);
+  if (ret < 0 && path[plen-1] != '/')
     return path;
 
-  if (!S_ISDIR(path_stat.st_mode))
+  if (ret >= 0 && !S_ISDIR(sb.st_mode))
     return path;
 
-  MD5Init(&md5);
-  MD5Update(&md5, (unsigned char *) folder, strlen(folder));
-  MD5Final(md5sum, &md5);
-
-  ret = snprintf(mutt_hcache_per_folder_path, _POSIX_PATH_MAX,
-                 "%s/%02x%02x%02x%02x%02x%02x%02x%02x"
-                 "%02x%02x%02x%02x%02x%02x%02x%02x",
-                 path, md5sum[0], md5sum[1], md5sum[2], md5sum[3],
-                 md5sum[4], md5sum[5], md5sum[6], md5sum[7], md5sum[8],
-                 md5sum[9], md5sum[10], md5sum[11], md5sum[12],
-                 md5sum[13], md5sum[14], md5sum[15]);
-
+  if (namer)
+  {
+    snprintf (hcpath, sizeof (hcpath), "%s%s", path,
+              path[plen-1] == '/' ? "" : "/");
+    if (path[plen-1] != '/')
+      plen++;
+
+    ret = namer (folder, hcpath + plen, sizeof (hcpath) - plen);
+  }
+  else
+  {
+    MD5Init(&md5);
+    MD5Update(&md5, (unsigned char *) folder, strlen(folder));
+    MD5Final(md5sum, &md5);
+
+    ret = snprintf(hcpath, _POSIX_PATH_MAX,
+                   "%s/%02x%02x%02x%02x%02x%02x%02x%02x"
+                   "%02x%02x%02x%02x%02x%02x%02x%02x",
+                   path, md5sum[0], md5sum[1], md5sum[2], md5sum[3],
+                   md5sum[4], md5sum[5], md5sum[6], md5sum[7], md5sum[8],
+                   md5sum[9], md5sum[10], md5sum[11], md5sum[12],
+                   md5sum[13], md5sum[14], md5sum[15]);
+  }
+  
   if (ret <= 0)
     return path;
 
-  return mutt_hcache_per_folder_path;
+  s = strchr (hcpath + 1, '/');
+  while (s)
+  {
+    /* create missing path components */
+    *s = '\0';
+    if (stat (hcpath, &sb) < 0 && (errno != ENOENT || mkdir (hcpath, 0777) < 0))
+      return path;
+    *s = '/';
+    s = strchr (s + 1, '/');
+  }
+
+  return hcpath;
 }
 

imap/imap.c

@@ -250 +250 @@
 
 #ifdef USE_HCACHE
-  imap_hcache_open (idata);
+  idata->hcache = imap_hcache_open (idata, NULL);
 #endif
 
@@ -1147 +1147 @@
 
 #if USE_HCACHE
-  imap_hcache_open (idata);
+  idata->hcache = imap_hcache_open (idata, NULL);
 #endif
 
@@ -1570 +1570 @@
   ciss_url_t url;
   char urlstr[LONG_STRING];
+  char cpath[LONG_STRING];
   unsigned int *uidvalidity = NULL;
   unsigned int *uidnext = NULL;
@@ -1595 +1596 @@
 
 #ifdef USE_HCACHE
-  mutt_account_tourl (&idata->conn->account, &url);
-  url.path = (char*)mbox;
-  url_ciss_tostring (&url, urlstr, sizeof (urlstr), 0);
-  hc = mutt_hcache_open (HeaderCache, urlstr, NULL);
+  hc = imap_hcache_open (idata, mbox);
   if (hc)
   {

imap/imap_private.h

@@ -260 +260 @@
 /* util.c */
 #ifdef USE_HCACHE
-int imap_hcache_open (IMAP_DATA* idata);
+header_cache_t* imap_hcache_open (IMAP_DATA* idata, const char* path);
 void imap_hcache_close (IMAP_DATA* idata);
 HEADER* imap_hcache_get (IMAP_DATA* idata, unsigned int uid);
@@ -273 +273 @@
 char* imap_fix_path (IMAP_DATA* idata, char* mailbox, char* path, 
   size_t plen);
+void imap_cachepath(IMAP_DATA* idata, const char* mailbox, char* dest,
+                    size_t dlen);
 int imap_get_literal_count (const char* buf, long* bytes);
 char* imap_get_qualifier (char* buf);

imap/message.c

@@ -120 +120 @@
 
 #if USE_HCACHE
-  imap_hcache_open (idata);
+  idata->hcache = imap_hcache_open (idata, NULL);
 
   if (idata->hcache && !msgbegin)
@@ -848 +848 @@
 static body_cache_t *msg_cache_open (IMAP_DATA *idata)
 {
-  char *s;
-  char *p = idata->mailbox;
   char mailbox[_POSIX_PATH_MAX];
-  size_t mlen = sizeof (mailbox);
 
   if (idata->bcache)
     return idata->bcache;
 
-  mailbox[0] = '\0';
-
-  for (s = mailbox; p && *p && mlen; mlen--)
-  {
-    if (*p == idata->delim)
-    {
-      *s = '/';
-      /* simple way to avoid collisions with UIDs */
-      if (*(p + 1) >= '0' && *(p + 1) <= '9')
-      {
-        mlen--;
-        if (mlen)
-          *++s = '_';
-      }
-    }
-    else
-      *s = *p;
-    p++;
-    s++;
-  }
-  *s = '\0';
+  imap_cachepath (idata, idata->mailbox, mailbox, sizeof (mailbox));
 
   return mutt_bcache_open (&idata->conn->account, mailbox);

imap/util.c

@@ -72 +72 @@
 
 #ifdef USE_HCACHE
-int imap_hcache_open (IMAP_DATA* idata)
+static int imap_hcache_namer (const char* path, char* dest, size_t dlen)
+{
+  return snprintf (dest, dlen, "%s.hcache", path);
+}
+
+header_cache_t* imap_hcache_open (IMAP_DATA* idata, const char* path)
 {
   IMAP_MBOX mx;
   ciss_url_t url;
   char cachepath[LONG_STRING];
+  char mbox[LONG_STRING];
 
   if (imap_parse_path (idata->ctx->path, &mx) < 0)
     return -1;
 
+  if (path)
+    imap_cachepath (idata, path, mbox, sizeof (mbox));
+  else
+  {
+    imap_cachepath (idata, mx.mbox, mbox, sizeof (mbox));
+    FREE (&mx.mbox);
+  }
+
   mutt_account_tourl (&idata->conn->account, &url);
-  url.path = mx.mbox;
-  url_ciss_tostring (&url, cachepath, sizeof (cachepath), 0);
-  FREE (&mx.mbox);
-
-  idata->hcache = mutt_hcache_open (HeaderCache, cachepath, NULL);
-
-  return idata->hcache != NULL ? 0 : -1;
+  url.path = mbox;
+  url_ciss_tostring (&url, cachepath, sizeof (cachepath), U_PATH);
+
+  return mutt_hcache_open (HeaderCache, cachepath, imap_hcache_namer);
 }
 
@@ -397 +408 @@
 
   return path;
+}
+
+void imap_cachepath(IMAP_DATA* idata, const char* mailbox, char* dest,
+                    size_t dlen)
+{
+  char* s;
+  const char* p = mailbox;
+
+  for (s = dest; p && *p && dlen; dlen--)
+  {
+    if (*p == idata->delim)
+    {
+      *s = '/';
+      /* simple way to avoid collisions with UIDs */
+      if (*(p + 1) >= '0' && *(p + 1) <= '9')
+      {
+        if (--dlen)
+          *++s = '_';
+      }
+    }
+    else
+      *s = *p;
+    p++;
+    s++;
+  }
+  *s = '\0';
 }