X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=e089bf1ba361a69dca42c0c06d40b6e36b86dc48;hp=058645f387a86c2b78a3df539536ba0bc3d5141d;hb=b98a7ae42f4b22221cf6ba32bf6f29431a07b604;hpb=c3e57678c8be193fc137854020f3a90887be97c9 diff --git a/hcache.c b/hcache.c index 058645f..e089bf1 100644 --- a/hcache.c +++ b/hcache.c @@ -8,62 +8,71 @@ * 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 + +#define MUTTNG_HCACHE_ID "0x004" -# if HAVE_INTTYPES_H +# ifdef HAVE_INTTYPES_H # include # else -# if HAVE_STDINT_H +# ifdef HAVE_STDINT_H # include # endif # endif -#if HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef USE_HCACHE - -#if HAVE_GDBM +#if defined(HAVE_QDBM) +#include +#include +#include +#elif defined(HAVE_GDBM) #include -#elif HAVE_DB4 +#elif defined(HAVE_DB4) #include #endif #include #include -#if HAVE_SYS_TIME_H +#ifdef HAVE_SYS_TIME_H #include #endif + +#include +#include + +#include + #include "mutt.h" -#ifdef USE_IMAP -#include "message.h" -#endif -#include "mime.h" +#include #include "mx.h" #include "lib.h" -#include "md5.h" -#if HAVE_GDBM -static struct - header_cache { +#include "lib/debug.h" + +static struct header_cache { +#if defined(HAVE_QDBM) + VILLA *db; + char *folder; + unsigned int crc; +#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; - uint64_t uid_validity; + unsigned long uid_validity; } validate; static void *lazy_malloc (size_t siz) @@ -72,10 +81,10 @@ static void *lazy_malloc (size_t siz) siz = 4096; } - return safe_malloc (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; @@ -83,7 +92,7 @@ static void lazy_realloc (void *ptr, size_t siz) return; } - safe_realloc (ptr, siz); + p_realloc(p, siz); } static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off) @@ -111,7 +120,7 @@ static unsigned char *dump_char (char *c, unsigned char *d, int *off) return d; } - size = mutt_strlen (c) + 1; + size = m_strlen(c) + 1; d = dump_int (size, d, off); lazy_realloc (&d, *off + size); memcpy (d + *off, c, size); @@ -150,12 +159,11 @@ static void restore_char (char **c, const unsigned char *d, int *off) return; } - *c = safe_malloc (size); - memcpy (*c, d + *off, size); + *c = p_dup(d + *off, size); *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; @@ -163,9 +171,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); @@ -178,17 +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 = safe_malloc (sizeof (ADDRESS)); -#ifdef EXACT_ADDRESS - restore_char (&(*a)->val, d, off); -#endif + *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); @@ -224,7 +226,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 = p_new(LIST, 1); restore_char (&(*l)->data, d, off); l = &(*l)->next; counter--; @@ -262,7 +264,7 @@ static void restore_buffer (BUFFER ** b, const unsigned char *d, int *off) return; } - *b = safe_malloc (sizeof (BUFFER)); + *b = p_new(BUFFER, 1); restore_char (&(*b)->data, d, off); restore_int (&offset, d, off); @@ -300,7 +302,7 @@ restore_parameter (PARAMETER ** p, const unsigned char *d, int *off) restore_int (&counter, d, off); while (counter) { - *p = safe_malloc (sizeof (PARAMETER)); + *p = p_new(PARAMETER, 1); restore_char (&(*p)->attribute, d, off); restore_char (&(*p)->value, d, off); p = &(*p)->next; @@ -367,6 +369,14 @@ static unsigned char *dump_envelope (ENVELOPE * e, unsigned char *d, int *off) d = dump_char (e->supersedes, d, off); d = dump_char (e->date, d, off); d = dump_char (e->x_label, d, off); + d = dump_char (e->list_post, 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); @@ -400,6 +410,14 @@ 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); + restore_char (&e->list_post, 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); @@ -424,37 +442,27 @@ static int generate_crc32 () int crc = 0; crc = crc32 (crc, (unsigned char const *) - "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613", - mutt_strlen - ("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 *) "HAVE_LANGINFO_CODESET", - mutt_strlen ("HAVE_LANGINFO_CODESET")); -#endif - -#if EXACT_ADDRESS - crc = - crc32 (crc, (unsigned char const *) "EXACT_ADDRESS", - mutt_strlen ("EXACT_ADDRESS")); + MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613", + m_strlen + (MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613")); + +#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", mutt_strlen ("USE_POP")); -#endif + crc = crc32(crc, (unsigned char const *) "USE_POP", m_strlen("USE_POP")); #ifdef MIXMASTER - crc = - crc32 (crc, (unsigned char const *) "MIXMASTER", - mutt_strlen ("MIXMASTER")); + crc = crc32(crc, (unsigned char const *) "MIXMASTER", + m_strlen("MIXMASTER")); #endif -#ifdef USE_IMAP - crc = - crc32 (crc, (unsigned char const *) "USE_IMAP", mutt_strlen ("USE_IMAP")); + crc = crc32(crc, (unsigned char const *) "USE_IMAP", m_strlen("USE_IMAP")); + +#ifdef USE_NNTP + crc = crc32(crc, (unsigned char const *) "USE_NNTP", m_strlen("USE_NNTP")); #endif return crc; } @@ -493,7 +501,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, m_strlen(folder)); MD5Final (md5sum, &md5); ret = snprintf (mutt_hcache_per_folder_path, _POSIX_PATH_MAX, @@ -514,7 +522,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 +532,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; @@ -550,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); @@ -561,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 (); @@ -572,27 +580,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); - mutt_free_header (oh); + h->path = m_strdup((*oh)->path); + header_delete(oh); } return h; } -#if HAVE_GDBM +#if defined(HAVE_QDBM) +void * +mutt_hcache_open(const char *path, const char *folder) +{ + struct header_cache *h = p_new(struct header_cache, 1); + int flags = VL_OWRITER | VL_OCREAT; + h->db = NULL; + h->folder = m_strdup(folder); + h->crc = generate_crc32(); + + if (!path || path[0] == '\0') + { + p_delete(&h->folder); + p_delete(&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 + { + p_delete(&h->folder); + p_delete(&h); + + return NULL; + } +} + +void +mutt_hcache_close(void *db) +{ + struct header_cache *h = db; + + if (!h) + return; + + vlclose(h->db); + p_delete(&h->folder); + p_delete(&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; + + 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)) + { + p_delete(&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; + + m_strcpy(path, sizeof(path), h->folder); + m_strcat(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); + + p_delete(&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; + + 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 defined(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 = p_new(HEADER_CACHE, 1); int pagesize = atoi (HeaderCachePageSize) ? atoi (HeaderCachePageSize) : 16384; h->db = NULL; - h->folder = safe_strdup (folder); + h->folder = m_strdup(folder); h->crc = generate_crc32 (); if (!path || path[0] == '\0') { - FREE (&h->folder); - FREE (&h); + p_delete(&h->folder); + p_delete(&h); return NULL; } @@ -609,8 +739,8 @@ void *mutt_hcache_open (const char *path, const char *folder) return h; } else { - FREE (&h->folder); - FREE (&h); + p_delete(&h->folder); + p_delete(&h); return NULL; } @@ -625,8 +755,8 @@ void mutt_hcache_close (void *db) } gdbm_close (h->db); - FREE (&h->folder); - FREE (&h); + p_delete(&h->folder); + p_delete(&h); } void *mutt_hcache_fetch (void *db, const char *filename, @@ -641,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) - mutt_strlen (path)); + m_strcpy(path, sizeof(path), h->folder); + strncat (path, filename, sizeof (path) - m_strlen(path)); key.dptr = path; key.dsize = keylen (path); @@ -650,7 +780,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); + p_delete(&data.dptr); return NULL; } @@ -659,7 +789,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; @@ -671,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) - mutt_strlen (path)); + m_strcpy(path, sizeof(path), h->folder); + strncat (path, filename, sizeof (path) - m_strlen(path)); key.dptr = path; key.dsize = keylen (path); @@ -681,7 +811,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header, ret = gdbm_store (h->db, key, data, GDBM_REPLACE); - FREE (&data.dptr); + p_delete(&data.dptr); return ret; } @@ -698,15 +828,15 @@ mutt_hcache_delete (void *db, const char *filename, return -1; } - strncpy (path, h->folder, sizeof (path)); - strncat (path, filename, sizeof (path) - mutt_strlen (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) { @@ -735,7 +865,7 @@ void *mutt_hcache_open (const char *path, const char *folder) h->crc = generate_crc32 (); if (!path || path[0] == '\0') { - FREE (&h); + p_delete(&h); return NULL; } @@ -745,13 +875,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); + p_delete(&h); return NULL; } if (mx_lock_file (h->lockfile, h->fd, 1, 0, 5)) { close (h->fd); - FREE (&h); + p_delete(&h); return NULL; } @@ -759,19 +889,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); + p_delete(&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); + p_delete(&h); return NULL; } } @@ -781,13 +911,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); + p_delete(&h); return NULL; } @@ -797,7 +927,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 +936,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); + p_delete(&h); } void *mutt_hcache_fetch (void *db, const char *filename, @@ -830,7 +959,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); + p_delete(&data.data); return NULL; } @@ -839,7 +968,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 +991,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header, ret = h->db->put (h->db, NULL, &key, &data, 0); - FREE (&data.data); + p_delete(&data.data); return ret; }