Changeset 5114:c72582d8023f

Timestamp:

2007-04-10 16:40:53 (21 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Add hcache path name hook

Files:

• hcache.c (modified) (7 diffs)
• hcache.h (modified) (1 diff)
• imap/imap.c (modified) (1 diff)
• imap/util.c (modified) (1 diff)
• mh.c (modified) (3 diffs)
• pop.c (modified) (2 diffs)

hcache.c

@@ -465 +465 @@
 /* Append md5sumed folder to path if path is a directory. */
 static const char *
-mutt_hcache_per_folder(const char *path, const char *folder)
+mutt_hcache_per_folder(const char *path, const char *folder,
+                       hcache_namer_t namer)
 {
   static char mutt_hcache_per_folder_path[_POSIX_PATH_MAX];
@@ -750 +751 @@
 #if HAVE_QDBM
 header_cache_t *
-mutt_hcache_open(const char *path, const char *folder)
+mutt_hcache_open(const char *path, const char *folder, hcache_namer_t namer)
 {
   struct header_cache *h = safe_calloc(1, sizeof (HEADER_CACHE));
@@ -766 +767 @@
   }
 
-  path = mutt_hcache_per_folder(path, h->folder);
+  path = mutt_hcache_per_folder(path, h->folder, namer);
 
   if (option(OPTHCACHECOMPRESS))
@@ -815 +816 @@
 
 header_cache_t *
-mutt_hcache_open(const char *path, const char *folder)
+mutt_hcache_open(const char *path, const char *folder, hcache_namer_t namer)
 {
   struct header_cache *h = safe_calloc(1, sizeof (HEADER_CACHE));
@@ -831 +832 @@
   }
 
-  path = mutt_hcache_per_folder(path, h->folder);
+  path = mutt_hcache_per_folder(path, h->folder, namer);
 
   h->db = gdbm_open((char *) path, pagesize, GDBM_WRCREAT, 00600, NULL);
@@ -899 +900 @@
 
 header_cache_t *
-mutt_hcache_open(const char *path, const char *folder)
+mutt_hcache_open(const char *path, const char *folder, hcache_namer_t namer)
 {
   struct stat sb;
@@ -917 +918 @@
 
   tmp = get_foldername (folder);
-  path = mutt_hcache_per_folder(path, tmp);
+  path = mutt_hcache_per_folder(path, tmp, namer);
   snprintf(h->lockfile, _POSIX_PATH_MAX, "%s-lock-hack", path);
   FREE(&tmp);

hcache.h

@@ -25 +25 @@
 typedef struct header_cache header_cache_t;
 
-header_cache_t *mutt_hcache_open(const char *path, const char *folder);
+typedef int (*hcache_namer_t)(const char* path, char* dest, size_t dlen);
+
+header_cache_t *mutt_hcache_open(const char *path, const char *folder,
+  hcache_namer_t namer);
 void mutt_hcache_close(header_cache_t *h);
 HEADER *mutt_hcache_restore(const unsigned char *d, HEADER **oh);

imap/imap.c

@@ -1598 +1598 @@
   url.path = (char*)mbox;
   url_ciss_tostring (&url, urlstr, sizeof (urlstr), 0);
-  hc = mutt_hcache_open (HeaderCache, urlstr);
+  hc = mutt_hcache_open (HeaderCache, urlstr, NULL);
   if (hc)
   {

imap/util.c

@@ -86 +86 @@
   FREE (&mx.mbox);
 
-  idata->hcache = mutt_hcache_open (HeaderCache, cachepath);
+  idata->hcache = mutt_hcache_open (HeaderCache, cachepath, NULL);
 
   return idata->hcache != NULL ? 0 : -1;

mh.c

@@ -796 +796 @@
 #ifdef USE_HCACHE
   if (ctx && ctx->magic == M_MH)
-    hc = mutt_hcache_open (HeaderCache, ctx->path);
+    hc = mutt_hcache_open (HeaderCache, ctx->path, NULL);
 #endif
 
@@ -999 +999 @@
   int ret;
 
-  hc = mutt_hcache_open (HeaderCache, ctx->path);
+  hc = mutt_hcache_open (HeaderCache, ctx->path, NULL);
 #endif
 
@@ -1587 +1587 @@
 #if USE_HCACHE
   if (ctx->magic == M_MAILDIR || ctx->magic == M_MH)
-    hc = mutt_hcache_open(HeaderCache, ctx->path);
+    hc = mutt_hcache_open(HeaderCache, ctx->path, NULL);
 #endif /* USE_HCACHE */
 

pop.c

@@ -204 +204 @@
   void *data;
 
-  hc = mutt_hcache_open (HeaderCache, ctx->path);
+  hc = mutt_hcache_open (HeaderCache, ctx->path, NULL);
 #endif
 
@@ -614 +614 @@
 
 #if USE_HCACHE
-    hc = mutt_hcache_open (HeaderCache, ctx->path);
+    hc = mutt_hcache_open (HeaderCache, ctx->path, NULL);
 #endif