X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=1a86d4c5690c68229fafbadc69e30014b5b78b85;hp=058645f387a86c2b78a3df539536ba0bc3d5141d;hb=5945a5016adb82ec9a29c9f7741cea269484e608;hpb=c3e57678c8be193fc137854020f3a90887be97c9 diff --git a/hcache.c b/hcache.c index 058645f..1a86d4c 100644 --- a/hcache.c +++ b/hcache.c @@ -8,6 +8,11 @@ * It's licensed under the GNU General Public License, * please see the file GPL in the top level source directory. */ +#if HAVE_CONFIG_H +#include "config.h" +#endif /* HAVE_CONFIG_H */ + +#ifdef USE_HCACHE # if HAVE_INTTYPES_H # include @@ -17,13 +22,11 @@ # endif # endif -#if HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef USE_HCACHE - -#if HAVE_GDBM +#if HAVE_QDBM +#include +#include +#include +#elif HAVE_GDBM #include #elif HAVE_DB4 #include @@ -43,7 +46,17 @@ #include "lib.h" #include "md5.h" -#if HAVE_GDBM +#include "lib/mem.h" +#include "lib/debug.h" + +#if HAVE_QDBM +static struct + header_cache { + VILLA *db; + char *folder; + unsigned int crc; +} HEADER_CACHE; +#elif HAVE_GDBM static struct header_cache { GDBM_FILE db; @@ -63,7 +76,7 @@ static struct typedef union { struct timeval timeval; - uint64_t uid_validity; + unsigned long uid_validity; } validate; static void *lazy_malloc (size_t siz) @@ -72,7 +85,7 @@ static void *lazy_malloc (size_t siz) siz = 4096; } - return safe_malloc (siz); + return mem_malloc (siz); } static void lazy_realloc (void *ptr, size_t siz) @@ -83,7 +96,7 @@ static void lazy_realloc (void *ptr, size_t siz) return; } - safe_realloc (ptr, siz); + mem_realloc (ptr, siz); } static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off) @@ -111,7 +124,7 @@ static unsigned char *dump_char (char *c, unsigned char *d, int *off) return d; } - size = mutt_strlen (c) + 1; + size = str_len (c) + 1; d = dump_int (size, d, off); lazy_realloc (&d, *off + size); memcpy (d + *off, c, size); @@ -150,7 +163,7 @@ static void restore_char (char **c, const unsigned char *d, int *off) return; } - *c = safe_malloc (size); + *c = mem_malloc (size); memcpy (*c, d + *off, size); *off += size; } @@ -163,9 +176,6 @@ static unsigned char *dump_address (ADDRESS * a, unsigned char *d, int *off) d = dump_int (0xdeadbeef, d, off); while (a) { -#ifdef EXACT_ADDRESS - d = dump_char (a->val, d, off); -#endif d = dump_char (a->personal, d, off); d = dump_char (a->mailbox, d, off); d = dump_int (a->group, d, off); @@ -185,10 +195,7 @@ static void restore_address (ADDRESS ** a, const unsigned char *d, int *off) restore_int (&counter, d, off); while (counter) { - *a = safe_malloc (sizeof (ADDRESS)); -#ifdef EXACT_ADDRESS - restore_char (&(*a)->val, d, off); -#endif + *a = mem_malloc (sizeof (ADDRESS)); restore_char (&(*a)->personal, d, off); restore_char (&(*a)->mailbox, d, off); restore_int ((unsigned int *) &(*a)->group, d, off); @@ -224,7 +231,7 @@ static void restore_list (LIST ** l, const unsigned char *d, int *off) restore_int (&counter, d, off); while (counter) { - *l = safe_malloc (sizeof (LIST)); + *l = mem_malloc (sizeof (LIST)); restore_char (&(*l)->data, d, off); l = &(*l)->next; counter--; @@ -262,7 +269,7 @@ static void restore_buffer (BUFFER ** b, const unsigned char *d, int *off) return; } - *b = safe_malloc (sizeof (BUFFER)); + *b = mem_malloc (sizeof (BUFFER)); restore_char (&(*b)->data, d, off); restore_int (&offset, d, off); @@ -300,7 +307,7 @@ restore_parameter (PARAMETER ** p, const unsigned char *d, int *off) restore_int (&counter, d, off); while (counter) { - *p = safe_malloc (sizeof (PARAMETER)); + *p = mem_malloc (sizeof (PARAMETER)); restore_char (&(*p)->attribute, d, off); restore_char (&(*p)->value, d, off); p = &(*p)->next; @@ -368,6 +375,13 @@ static unsigned char *dump_envelope (ENVELOPE * e, unsigned char *d, int *off) d = dump_char (e->date, d, off); d = dump_char (e->x_label, d, off); +#ifdef USE_NNTP + d = dump_char (e->newsgroups, d, off); + d = dump_char (e->xref, d, off); + d = dump_char (e->followup_to, d, off); + d = dump_char (e->x_comment_to, d, off); +#endif + d = dump_list (e->references, d, off); d = dump_list (e->in_reply_to, d, off); d = dump_list (e->userhdrs, d, off); @@ -400,6 +414,13 @@ static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off) restore_char (&e->supersedes, d, off); restore_char (&e->date, d, off); restore_char (&e->x_label, d, off); + +#ifdef USE_NNTP + restore_char (&e->newsgroups, d, off); + restore_char (&e->xref, d, off); + restore_char (&e->followup_to, d, off); + restore_char (&e->x_comment_to, d, off); +#endif restore_list (&e->references, d, off); restore_list (&e->in_reply_to, d, off); @@ -425,36 +446,35 @@ static int generate_crc32 () crc = crc32 (crc, (unsigned char const *) "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613", - mutt_strlen + str_len ("sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613")); #if HAVE_LANGINFO_CODESET - crc = crc32 (crc, (unsigned char const *) Charset, mutt_strlen (Charset)); + crc = crc32 (crc, (unsigned char const *) Charset, str_len (Charset)); crc = crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET", - mutt_strlen ("HAVE_LANGINFO_CODESET")); -#endif - -#if EXACT_ADDRESS - crc = - crc32 (crc, (unsigned char const *) "EXACT_ADDRESS", - mutt_strlen ("EXACT_ADDRESS")); + str_len ("HAVE_LANGINFO_CODESET")); #endif #ifdef USE_POP crc = - crc32 (crc, (unsigned char const *) "USE_POP", mutt_strlen ("USE_POP")); + crc32 (crc, (unsigned char const *) "USE_POP", str_len ("USE_POP")); #endif #ifdef MIXMASTER crc = crc32 (crc, (unsigned char const *) "MIXMASTER", - mutt_strlen ("MIXMASTER")); + str_len ("MIXMASTER")); #endif #ifdef USE_IMAP crc = - crc32 (crc, (unsigned char const *) "USE_IMAP", mutt_strlen ("USE_IMAP")); + crc32 (crc, (unsigned char const *) "USE_IMAP", str_len ("USE_IMAP")); +#endif + +#ifdef USE_NNTP + crc = + crc32 (crc, (unsigned char const *) "USE_NNTP", str_len ("USE_NNTP")); #endif return crc; } @@ -493,7 +513,7 @@ static const char *mutt_hcache_per_folder (const char *path, } MD5Init (&md5); - MD5Update (&md5, (unsigned char *) folder, strlen (folder)); + MD5Update (&md5, (unsigned char *) folder, str_len (folder)); MD5Final (md5sum, &md5); ret = snprintf (mutt_hcache_per_folder_path, _POSIX_PATH_MAX, @@ -514,7 +534,7 @@ static const char *mutt_hcache_per_folder (const char *path, /* This function transforms a header into a char so that it is useable by * db_store */ static void *mutt_hcache_dump (void *_db, HEADER * h, int *off, - uint64_t uid_validity) + unsigned long uid_validity) { struct header_cache *db = _db; unsigned char *d = NULL; @@ -524,7 +544,7 @@ static void *mutt_hcache_dump (void *_db, HEADER * h, int *off, d = lazy_malloc (sizeof (validate)); if (uid_validity) { - memcpy (d, &uid_validity, sizeof (uint64_t)); + memcpy (d, &uid_validity, sizeof (unsigned long)); } else { struct timeval now; @@ -572,27 +592,149 @@ 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 = safe_strdup ((*oh)->path); + h->path = str_dup ((*oh)->path); mutt_free_header (oh); } return h; } -#if HAVE_GDBM +#if HAVE_QDBM +void * +mutt_hcache_open(const char *path, const char *folder) +{ + struct header_cache *h = mem_calloc(1, sizeof (HEADER_CACHE)); + int flags = VL_OWRITER | VL_OCREAT; + h->db = NULL; + h->folder = str_dup(folder); + h->crc = generate_crc32(); + + if (!path || path[0] == '\0') + { + mem_free(&h->folder); + mem_free(&h); + return NULL; + } + + path = mutt_hcache_per_folder(path, folder); + + if (option(OPTHCACHECOMPRESS)) + flags |= VL_OZCOMP; + + h->db = vlopen(path, flags, VL_CMPLEX); + if (h->db) + return h; + else + { + mem_free(&h->folder); + mem_free(&h); + + return NULL; + } +} + +void +mutt_hcache_close(void *db) +{ + struct header_cache *h = db; + + if (!h) + return; + + vlclose(h->db); + mem_free(&h->folder); + mem_free(&h); +} + +void * +mutt_hcache_fetch(void *db, const char *filename, + size_t(*keylen) (const char *fn)) +{ + struct header_cache *h = db; + char path[_POSIX_PATH_MAX]; + int ksize; + char *data = NULL; + + if (!h) + return NULL; + + strncpy(path, h->folder, sizeof (path)); + str_cat(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)) + { + mem_free(&data); + return NULL; + } + + return data; +} + +int +mutt_hcache_store(void *db, const char *filename, HEADER * header, + unsigned long uid_validity, + size_t(*keylen) (const char *fn)) +{ + struct header_cache *h = db; + char path[_POSIX_PATH_MAX]; + int ret; + int ksize, dsize; + char *data = NULL; + + if (!h) + return -1; + + strncpy(path, h->folder, sizeof (path)); + str_cat(path, sizeof (path), filename); + + ksize = strlen(h->folder) + keylen(path + strlen(h->folder)); + + data = mutt_hcache_dump(db, header, &dsize, uid_validity); + + ret = vlput(h->db, path, ksize, data, dsize, VL_DOVER); + + mem_free(&data); + + return ret; +} + +int +mutt_hcache_delete(void *db, const char *filename, + size_t(*keylen) (const char *fn)) +{ + struct header_cache *h = db; + char path[_POSIX_PATH_MAX]; + int ksize; + + if (!h) + return -1; + + strncpy(path, h->folder, sizeof (path)); + str_cat(path, sizeof (path), filename); + + ksize = strlen(h->folder) + keylen(path + strlen(h->folder)); + + return vlout(h->db, path, ksize); +} + +#elif HAVE_GDBM void *mutt_hcache_open (const char *path, const char *folder) { - struct header_cache *h = safe_calloc (1, sizeof (HEADER_CACHE)); + struct header_cache *h = mem_calloc (1, sizeof (HEADER_CACHE)); int pagesize = atoi (HeaderCachePageSize) ? atoi (HeaderCachePageSize) : 16384; h->db = NULL; - h->folder = safe_strdup (folder); + h->folder = str_dup (folder); h->crc = generate_crc32 (); if (!path || path[0] == '\0') { - FREE (&h->folder); - FREE (&h); + mem_free (&h->folder); + mem_free (&h); return NULL; } @@ -609,8 +751,8 @@ void *mutt_hcache_open (const char *path, const char *folder) return h; } else { - FREE (&h->folder); - FREE (&h); + mem_free (&h->folder); + mem_free (&h); return NULL; } @@ -625,8 +767,8 @@ void mutt_hcache_close (void *db) } gdbm_close (h->db); - FREE (&h->folder); - FREE (&h); + mem_free (&h->folder); + mem_free (&h); } void *mutt_hcache_fetch (void *db, const char *filename, @@ -642,7 +784,7 @@ void *mutt_hcache_fetch (void *db, const char *filename, } strncpy (path, h->folder, sizeof (path)); - strncat (path, filename, sizeof (path) - mutt_strlen (path)); + strncat (path, filename, sizeof (path) - str_len (path)); key.dptr = path; key.dsize = keylen (path); @@ -650,7 +792,7 @@ void *mutt_hcache_fetch (void *db, const char *filename, data = gdbm_fetch (h->db, key); if (!crc32_matches (data.dptr, h->crc)) { - free (data.dptr); + mem_free(&data.dptr); return NULL; } @@ -659,7 +801,7 @@ void *mutt_hcache_fetch (void *db, const char *filename, int mutt_hcache_store (void *db, const char *filename, HEADER * header, - uint64_t uid_validity, size_t (*keylen) (const char *fn)) + unsigned long uid_validity, size_t (*keylen) (const char *fn)) { struct header_cache *h = db; datum key; @@ -672,7 +814,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header, } strncpy (path, h->folder, sizeof (path)); - strncat (path, filename, sizeof (path) - mutt_strlen (path)); + strncat (path, filename, sizeof (path) - str_len (path)); key.dptr = path; key.dsize = keylen (path); @@ -681,7 +823,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header, ret = gdbm_store (h->db, key, data, GDBM_REPLACE); - FREE (&data.dptr); + mem_free (&data.dptr); return ret; } @@ -699,7 +841,7 @@ mutt_hcache_delete (void *db, const char *filename, } strncpy (path, h->folder, sizeof (path)); - strncat (path, filename, sizeof (path) - mutt_strlen (path)); + strncat (path, filename, sizeof (path) - str_len (path)); key.dptr = path; key.dsize = keylen (path); @@ -735,7 +877,7 @@ void *mutt_hcache_open (const char *path, const char *folder) h->crc = generate_crc32 (); if (!path || path[0] == '\0') { - FREE (&h); + mem_free (&h); return NULL; } @@ -745,13 +887,13 @@ void *mutt_hcache_open (const char *path, const char *folder) h->fd = open (h->lockfile, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); if (h->fd < 0) { - FREE (&h); + mem_free (&h); return NULL; } if (mx_lock_file (h->lockfile, h->fd, 1, 0, 5)) { close (h->fd); - FREE (&h); + mem_free (&h); return NULL; } @@ -759,19 +901,19 @@ void *mutt_hcache_open (const char *path, const char *folder) if (ret) { mx_unlock_file (h->lockfile, h->fd, 0); close (h->fd); - FREE (&h); + mem_free (&h); return NULL; } ret = - h->env->open (h->env, NULL, DB_INIT_MPOOL | DB_CREATE | DB_PRIVATE, 0600); + (h->env->open)(h->env, NULL, DB_INIT_MPOOL | DB_CREATE | DB_PRIVATE, 0600); if (!ret) { ret = db_create (&h->db, h->env, 0); if (ret) { h->env->close (h->env, 0); mx_unlock_file (h->lockfile, h->fd, 0); close (h->fd); - FREE (&h); + mem_free (&h); return NULL; } } @@ -781,13 +923,13 @@ void *mutt_hcache_open (const char *path, const char *folder) h->db->set_pagesize (h->db, pagesize); } - ret = h->db->open (h->db, NULL, path, folder, DB_BTREE, createflags, 0600); + ret = (h->db->open)(h->db, NULL, path, folder, DB_BTREE, createflags, 0600); if (ret) { h->db->close (h->db, 0); h->env->close (h->env, 0); mx_unlock_file (h->lockfile, h->fd, 0); close (h->fd); - FREE (&h); + mem_free (&h); return NULL; } @@ -797,7 +939,6 @@ void *mutt_hcache_open (const char *path, const char *folder) void mutt_hcache_close (void *db) { struct header_cache *h = db; - int ret; if (!h) { return; @@ -807,7 +948,7 @@ void mutt_hcache_close (void *db) h->env->close (h->env, 0); mx_unlock_file (h->lockfile, h->fd, 0); close (h->fd); - FREE (&h); + mem_free (&h); } void *mutt_hcache_fetch (void *db, const char *filename, @@ -830,7 +971,7 @@ void *mutt_hcache_fetch (void *db, const char *filename, h->db->get (h->db, NULL, &key, &data, 0); if (!crc32_matches (data.data, h->crc)) { - free (data.data); + mem_free(&data.data); return NULL; } @@ -839,7 +980,7 @@ void *mutt_hcache_fetch (void *db, const char *filename, int mutt_hcache_store (void *db, const char *filename, HEADER * header, - uint64_t uid_validity, size_t (*keylen) (const char *fn)) + unsigned long uid_validity, size_t (*keylen) (const char *fn)) { DBT key; DBT data; @@ -862,7 +1003,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header, ret = h->db->put (h->db, NULL, &key, &data, 0); - FREE (&data.data); + mem_free (&data.data); return ret; }