X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=e089bf1ba361a69dca42c0c06d40b6e36b86dc48;hp=e69a591699f27b0d0ffba9ea1f5b985d21f2bb5c;hb=b98a7ae42f4b22221cf6ba32bf6f29431a07b604;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c

diff --git a/hcache.c b/hcache.c
index e69a591..e089bf1 100644
--- a/hcache.c
+++ b/hcache.c
@@ -16,68 +16,59 @@
 
 #define MUTTNG_HCACHE_ID        "0x004"
 
-# if HAVE_INTTYPES_H
+# ifdef HAVE_INTTYPES_H
 #  include <inttypes.h>
 # else
-#  if HAVE_STDINT_H
+#  ifdef HAVE_STDINT_H
 #   include <stdint.h>
 #  endif
 # endif
 
-#if HAVE_QDBM
+#if defined(HAVE_QDBM)
 #include <depot.h>
 #include <cabin.h>
 #include <villa.h>
-#elif HAVE_GDBM
+#elif defined(HAVE_GDBM)
 #include <gdbm.h>
-#elif HAVE_DB4
+#elif defined(HAVE_DB4)
 #include <db.h>
 #endif
 
 #include <errno.h>
 #include <fcntl.h>
-#if HAVE_SYS_TIME_H
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-hash/hash.h>
+
+#include <lib-mime/mime.h>
 
 #include "mutt.h"
-#ifdef USE_IMAP
-#include "message.h"
-#endif
-#include "mime.h"
+#include <imap/message.h>
 #include "mx.h"
 #include "lib.h"
-#include "md5.h"
 
-#include "lib/mem.h"
 #include "lib/debug.h"
 
-#if HAVE_QDBM
-static struct
-  header_cache {
+static struct header_cache {
+#if defined(HAVE_QDBM)
   VILLA *db;
   char *folder;
   unsigned int crc;
-} HEADER_CACHE;
-#elif HAVE_GDBM
-static struct
-  header_cache {
+#elif defined(HAVE_GDBM)
   GDBM_FILE db;
   char *folder;
   unsigned int crc;
-} HEADER_CACHE;
-#elif HAVE_DB4
-static struct
-  header_cache {
+#elif defined(HAVE_DB4)
   DB_ENV *env;
   DB *db;
   unsigned int crc;
   int fd;
   char lockfile[_POSIX_PATH_MAX];
-} HEADER_CACHE;
 #endif
+} HEADER_CACHE;
 
 typedef union {
   struct timeval timeval;
@@ -93,7 +84,7 @@ static void *lazy_malloc (size_t siz)
   return xmalloc(siz);
 }
 
-static void lazy_realloc (void *ptr, size_t siz)
+static void lazy_realloc(void *ptr, ssize_t siz)
 {
   void **p = (void **) ptr;
 
@@ -101,7 +92,7 @@ static void lazy_realloc (void *ptr, size_t siz)
     return;
   }
 
-  mem_realloc (ptr, siz);
+  p_realloc(p, siz);
 }
 
 static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off)
@@ -129,7 +120,7 @@ static unsigned char *dump_char (char *c, unsigned char *d, int *off)
     return d;
   }
 
-  size = str_len (c) + 1;
+  size = m_strlen(c) + 1;
   d = dump_int (size, d, off);
   lazy_realloc (&d, *off + size);
   memcpy (d + *off, c, size);
@@ -172,7 +163,7 @@ static void restore_char (char **c, const unsigned char *d, int *off)
   *off += size;
 }
 
-static unsigned char *dump_address (ADDRESS * a, unsigned char *d, int *off)
+static unsigned char *dump_address (address_t * a, unsigned char *d, int *off)
 {
   unsigned int counter = 0;
   unsigned int start_off = *off;
@@ -192,14 +183,14 @@ static unsigned char *dump_address (ADDRESS * a, unsigned char *d, int *off)
   return d;
 }
 
-static void restore_address (ADDRESS ** a, const unsigned char *d, int *off)
+static void restore_address (address_t ** a, const unsigned char *d, int *off)
 {
   unsigned int counter;
 
   restore_int (&counter, d, off);
 
   while (counter) {
-    *a = p_new(ADDRESS, 1);
+    *a = p_new(address_t, 1);
     restore_char (&(*a)->personal, d, off);
     restore_char (&(*a)->mailbox, d, off);
     restore_int ((unsigned int *) &(*a)->group, d, off);
@@ -452,35 +443,26 @@ static int generate_crc32 ()
 
   crc = crc32 (crc, (unsigned char const *)
                MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613",
-               str_len
+               m_strlen
                (MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
 
-#if HAVE_LANGINFO_CODESET
-  crc = crc32 (crc, (unsigned char const *) Charset, str_len (Charset));
-  crc =
-    crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
-           str_len ("HAVE_LANGINFO_CODESET"));
+#ifdef HAVE_LANGINFO_CODESET
+  crc = crc32(crc, (unsigned char const *) Charset, m_strlen(Charset));
+  crc = crc32(crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
+              m_strlen("HAVE_LANGINFO_CODESET"));
 #endif
 
-#ifdef USE_POP
-  crc =
-    crc32 (crc, (unsigned char const *) "USE_POP", str_len ("USE_POP"));
-#endif
+  crc = crc32(crc, (unsigned char const *) "USE_POP", m_strlen("USE_POP"));
 
 #ifdef MIXMASTER
-  crc =
-    crc32 (crc, (unsigned char const *) "MIXMASTER",
-           str_len ("MIXMASTER"));
+  crc = crc32(crc, (unsigned char const *) "MIXMASTER",
+              m_strlen("MIXMASTER"));
 #endif
 
-#ifdef USE_IMAP
-  crc =
-    crc32 (crc, (unsigned char const *) "USE_IMAP", str_len ("USE_IMAP"));
-#endif
+  crc = crc32(crc, (unsigned char const *) "USE_IMAP", m_strlen("USE_IMAP"));
 
 #ifdef USE_NNTP
-  crc =
-    crc32 (crc, (unsigned char const *) "USE_NNTP", str_len ("USE_NNTP"));
+  crc = crc32(crc, (unsigned char const *) "USE_NNTP", m_strlen("USE_NNTP"));
 #endif
   return crc;
 }
@@ -519,7 +501,7 @@ static const char *mutt_hcache_per_folder (const char *path,
   }
 
   MD5Init (&md5);
-  MD5Update (&md5, (unsigned char *) folder, str_len (folder));
+  MD5Update (&md5, (unsigned char *) folder, m_strlen(folder));
   MD5Final (md5sum, &md5);
 
   ret = snprintf (mutt_hcache_per_folder_path, _POSIX_PATH_MAX,
@@ -576,7 +558,7 @@ static void *mutt_hcache_dump (void *_db, HEADER * h, int *off,
 HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh)
 {
   int off = 0;
-  HEADER *h = mutt_new_header ();
+  HEADER *h = header_new();
 
   /* skip validate */
   off += sizeof (validate);
@@ -587,7 +569,7 @@ HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh)
   memcpy (h, d + off, sizeof (HEADER));
   off += sizeof (HEADER);
 
-  h->env = mutt_new_envelope ();
+  h->env = envelope_new();
   restore_envelope (h->env, d, &off);
 
   h->content = mutt_new_body ();
@@ -598,21 +580,21 @@ HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh)
   /* this is needed for maildir style mailboxes */
   if (oh) {
     h->old = (*oh)->old;
-    h->path = str_dup ((*oh)->path);
-    mutt_free_header (oh);
+    h->path = m_strdup((*oh)->path);
+    header_delete(oh);
   }
 
   return h;
 }
 
-#if HAVE_QDBM
+#if defined(HAVE_QDBM)
 void *
 mutt_hcache_open(const char *path, const char *folder)
 {
-  struct header_cache *h = p_new(HEADER_CACHE, 1);
+  struct header_cache *h = p_new(struct header_cache, 1);
   int    flags = VL_OWRITER | VL_OCREAT;
   h->db = NULL;
-  h->folder = str_dup(folder);
+  h->folder = m_strdup(folder);
   h->crc = generate_crc32();
 
   if (!path || path[0] == '\0')
@@ -664,14 +646,14 @@ mutt_hcache_fetch(void *db, const char *filename,
   if (!h)
     return NULL;
 
-  strncpy(path, h->folder, sizeof (path));
-  str_cat(path, sizeof (path), filename);
+  m_strcpy(path, sizeof(path), h->folder);
+  m_strcat(path, sizeof(path), filename);
 
   ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
 
   data = vlget(h->db, path, ksize, NULL);
 
-  if (! crc32_matches(data, h->crc))
+  if (!crc32_matches(data, h->crc))
   {
     p_delete(&data);
     return NULL;
@@ -694,8 +676,8 @@ mutt_hcache_store(void *db, const char *filename, HEADER * header,
   if (!h)
     return -1;
 
-  strncpy(path, h->folder, sizeof (path));
-  str_cat(path, sizeof (path), filename);
+  m_strcpy(path, sizeof(path), h->folder);
+  m_strcat(path, sizeof(path), filename);
 
   ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
 
@@ -719,15 +701,15 @@ mutt_hcache_delete(void *db, const char *filename,
   if (!h)
     return -1;
 
-  strncpy(path, h->folder, sizeof (path));
-  str_cat(path, sizeof (path), filename);
+  m_strcpy(path, sizeof(path), h->folder);
+  m_strcat(path, sizeof(path), filename);
 
   ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
 
   return vlout(h->db, path, ksize);
 }
 
-#elif HAVE_GDBM
+#elif defined(HAVE_GDBM)
 
 void *mutt_hcache_open (const char *path, const char *folder)
 {
@@ -735,7 +717,7 @@ void *mutt_hcache_open (const char *path, const char *folder)
   int pagesize =
     atoi (HeaderCachePageSize) ? atoi (HeaderCachePageSize) : 16384;
   h->db = NULL;
-  h->folder = str_dup (folder);
+  h->folder = m_strdup(folder);
   h->crc = generate_crc32 ();
 
   if (!path || path[0] == '\0') {
@@ -789,8 +771,8 @@ void *mutt_hcache_fetch (void *db, const char *filename,
     return NULL;
   }
 
-  strncpy (path, h->folder, sizeof (path));
-  strncat (path, filename, sizeof (path) - str_len (path));
+  m_strcpy(path, sizeof(path), h->folder);
+  strncat (path, filename, sizeof (path) - m_strlen(path));
 
   key.dptr = path;
   key.dsize = keylen (path);
@@ -819,8 +801,8 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header,
     return -1;
   }
 
-  strncpy (path, h->folder, sizeof (path));
-  strncat (path, filename, sizeof (path) - str_len (path));
+  m_strcpy(path, sizeof(path), h->folder);
+  strncat (path, filename, sizeof (path) - m_strlen(path));
 
   key.dptr = path;
   key.dsize = keylen (path);
@@ -846,15 +828,15 @@ mutt_hcache_delete (void *db, const char *filename,
     return -1;
   }
 
-  strncpy (path, h->folder, sizeof (path));
-  strncat (path, filename, sizeof (path) - str_len (path));
+  m_strcpy(path, sizeof(path), h->folder);
+  strncat (path, filename, sizeof (path) - m_strlen(path));
 
   key.dptr = path;
   key.dsize = keylen (path);
 
   return gdbm_delete (h->db, key);
 }
-#elif HAVE_DB4
+#elif defined(HAVE_DB4)
 
 static void mutt_hcache_dbt_init (DBT * dbt, void *data, size_t len)
 {