Save some stats when header cache already exists

diff --git a/ChangeLog b/ChangeLog
index af8e825304751c94cd48c974ed561a67d7c2b118..1bd7c7a77af21b92930c6bace85b423b821dd765 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
-2007-04-10 15:32 -0700  Brendan Cully  <brendan@kublai.com>  (c38765da3fe8)
+2007-04-10 17:40 -0700  Brendan Cully  <brendan@kublai.com>  (8082e4c9f524)
+
+       * hcache.c, imap/imap.c, imap/imap_private.h, imap/message.c,
+       imap/util.c: 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.
+
+       * hcache.c, hcache.h, imap/imap.c, imap/util.c, mh.c, pop.c: Add
+       hcache path name hook
+
+       * bcache.c, url.c, url.h: Simplify body cache path creation
+
+       * imap/imap.c, imap/imap_private.h, imap/message.c, imap/util.c:
+       Do not hold hcache open while mailbox is open - it can lead to
+       lockups
 
        * imap/command.c, imap/imap.c, imap/imap_private.h, imap/util.c: Add
        imap_hcache_del; minor cleanups

diff --git a/hcache.c b/hcache.c
index 05ae8a2f1b3dd70f931fd2a2510b5b1410204e88..a67524581c7e0104777e04f377271cee18f5007f 100644 (file)
--- a/hcache.c
+++ b/hcache.c
@@ -510,6 +510,9 @@ mutt_hcache_per_folder(const char *path, const char *folder,
   if (ret <= 0)
     return path;
 
+  if (stat (hcpath, &sb) >= 0)
+    return hcpath;
+
   s = strchr (hcpath + 1, '/');
   while (s)
   {