Merge commit 'upstream/1.5.21'

[software/mutt-debian.git] / hcache.c

diff --git a/hcache.c b/hcache.c
index 8b14aef1bf85dbfed7489e0b3079cd46cd605753..ddc0ec05f051417e3dfd43800cb9b02137c82422 100644 (file)
--- a/hcache.c
+++ b/hcache.c
@@ -45,6 +45,7 @@
 #include "mx.h"
 #include "lib.h"
 #include "md5.h"
 #include "mx.h"
 #include "lib.h"
 #include "md5.h"

+#include "rfc822.h"

 
 #if HAVE_QDBM
 static struct header_cache
 
 #if HAVE_QDBM
 static struct header_cache


@@ -85,7 +86,7 @@ static void mutt_hcache_dbt_empty_init(DBT * dbt);
 typedef union
 {
   struct timeval timeval;
 typedef union
 {
   struct timeval timeval;

-  unsigned long uid_validity;
+  unsigned int uidvalidity;

 } validate;
 
 static void *
 } validate;
 
 static void *


@@ -231,7 +232,7 @@ restore_address(ADDRESS ** a, const unsigned char *d, int *off, int convert)
 
   while (counter)
   {
 
   while (counter)
   {

-    *a = safe_malloc(sizeof (ADDRESS));
+    *a = rfc822_new_address();

 #ifdef EXACT_ADDRESS
     restore_char(&(*a)->val, d, off, convert);
 #endif
 #ifdef EXACT_ADDRESS
     restore_char(&(*a)->val, d, off, convert);
 #endif


@@ -588,7 +589,7 @@ mutt_hcache_per_folder(const char *path, const char *folder,
  * db_store */
 static void *
 mutt_hcache_dump(header_cache_t *h, HEADER * header, int *off,
  * db_store */
 static void *
 mutt_hcache_dump(header_cache_t *h, HEADER * header, int *off,

-                unsigned long uid_validity)
+                unsigned int uidvalidity)

 {
   unsigned char *d = NULL;
   HEADER nh;
 {
   unsigned char *d = NULL;
   HEADER nh;


@@ -597,8 +598,8 @@ mutt_hcache_dump(header_cache_t *h, HEADER * header, int *off,
   *off = 0;
   d = lazy_malloc(sizeof (validate));
 
   *off = 0;
   d = lazy_malloc(sizeof (validate));
 

-  if (uid_validity)
-    memcpy(d, &uid_validity, sizeof (unsigned long));
+  if (uidvalidity)
+    memcpy(d, &uidvalidity, sizeof (uidvalidity));

   else
   {
     struct timeval now;
   else
   {
     struct timeval now;


@@ -623,6 +624,7 @@ mutt_hcache_dump(header_cache_t *h, HEADER * header, int *off,
   nh.limited = 0;
   nh.num_hidden = 0;
   nh.recipient = 0;
   nh.limited = 0;
   nh.num_hidden = 0;
   nh.recipient = 0;

+  nh.pair = 0;

   nh.attach_valid = 0;
   nh.path = NULL;
   nh.tree = NULL;
   nh.attach_valid = 0;
   nh.path = NULL;
   nh.tree = NULL;


@@ -757,7 +759,7 @@ mutt_hcache_fetch_raw (header_cache_t *h, const char *filename,
 
 int
 mutt_hcache_store(header_cache_t *h, const char *filename, HEADER * header,
 
 int
 mutt_hcache_store(header_cache_t *h, const char *filename, HEADER * header,

-                 unsigned long uid_validity,
+                 unsigned int uidvalidity,

                  size_t(*keylen) (const char *fn))
 {
   char* data;
                  size_t(*keylen) (const char *fn))
 {
   char* data;


@@ -767,7 +769,7 @@ mutt_hcache_store(header_cache_t *h, const char *filename, HEADER * header,
   if (!h)
     return -1;
   
   if (!h)
     return -1;
   

-  data = mutt_hcache_dump(h, header, &dlen, uid_validity);
+  data = mutt_hcache_dump(h, header, &dlen, uidvalidity);

   ret = mutt_hcache_store_raw (h, filename, data, dlen, keylen);
   
   FREE(&data);
   ret = mutt_hcache_store_raw (h, filename, data, dlen, keylen);
   
   FREE(&data);


@@ -828,19 +830,23 @@ mutt_hcache_store_raw (header_cache_t* h, const char* filename, void* data,
 #endif
 }
 
 #endif
 }
 

-static char* get_foldername(const char *folder) {
+static char* get_foldername(const char *folder)
+{

   char *p = NULL;
   char *p = NULL;

+  char path[_POSIX_PATH_MAX];

   struct stat st;
 
   struct stat st;
 

+  mutt_encode_path (path, sizeof (path), folder);
+

   /* if the folder is local, canonify the path to avoid
    * to ensure equivalent paths share the hcache */
   /* if the folder is local, canonify the path to avoid
    * to ensure equivalent paths share the hcache */

-  if (stat (folder, &st) == 0)
+  if (stat (path, &st) == 0)

   {
     p = safe_malloc (PATH_MAX+1);
   {
     p = safe_malloc (PATH_MAX+1);

-    if (!realpath (folder, p))
-      mutt_str_replace (&p, folder);
+    if (!realpath (path, p))
+      mutt_str_replace (&p, path);

   } else
   } else

-    p = safe_strdup (folder);
+    p = safe_strdup (path);

 
   return p;
 }
 
   return p;
 }