X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=da3d6bbc08b9b7b3198c9ebac9619b3bafae088f;hp=1a86d4c5690c68229fafbadc69e30014b5b78b85;hb=01bd0a7410e476abaebf03d820bcf31a5ec4c7c0;hpb=841a368ddea400022328f35dd8c7a3eb6f543892 diff --git a/hcache.c b/hcache.c index 1a86d4c..da3d6bb 100644 --- a/hcache.c +++ b/hcache.c @@ -14,89 +14,77 @@ #ifdef USE_HCACHE -# if HAVE_INTTYPES_H +#define MUTTNG_HCACHE_ID "0x004" + +# ifdef HAVE_INTTYPES_H # include # else -# if HAVE_STDINT_H +# ifdef HAVE_STDINT_H # include # endif # endif -#if HAVE_QDBM +#if defined(HAVE_QDBM) #include #include #include -#elif HAVE_GDBM +#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 + +#include "charset.h" #include "mutt.h" -#ifdef USE_IMAP -#include "message.h" -#endif -#include "mime.h" +#include #include "mx.h" #include "lib.h" -#include "md5.h" - -#include "lib/mem.h" -#include "lib/debug.h" -#if HAVE_QDBM -static struct - header_cache { +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 +}; typedef union { struct timeval timeval; unsigned long uid_validity; } validate; -static void *lazy_malloc (size_t siz) -{ - if (0 < siz && siz < 4096) { - siz = 4096; - } +#define UPPER4K(i) ((i & ~(4096 - 1)) + 4096) - return mem_malloc (siz); +static unsigned char *lazy_malloc(ssize_t siz) +{ + return p_new(unsigned char, UPPER4K(siz)); } -static void lazy_realloc (void *ptr, size_t siz) +static void lazy_realloc(unsigned char **p, ssize_t siz) { - void **p = (void **) ptr; - - if (p != NULL && 0 < siz && siz < 4096) { - return; - } - - mem_realloc (ptr, siz); + p_realloc(p, UPPER4K(siz)); } static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off) @@ -124,25 +112,7 @@ static unsigned char *dump_char (char *c, unsigned char *d, int *off) return d; } - size = str_len (c) + 1; - d = dump_int (size, d, off); - lazy_realloc (&d, *off + size); - memcpy (d + *off, c, size); - *off += size; - - return d; -} - -#if 0 -static unsigned char *dump_char_size (char *c, unsigned char *d, int *off, - ssize_t size) -{ - if (c == NULL) { - size = 0; - d = dump_int (size, d, off); - return d; - } - + size = m_strlen(c) + 1; d = dump_int (size, d, off); lazy_realloc (&d, *off + size); memcpy (d + *off, c, size); @@ -150,7 +120,6 @@ static unsigned char *dump_char_size (char *c, unsigned char *d, int *off, return d; } -#endif static void restore_char (char **c, const unsigned char *d, int *off) { @@ -163,12 +132,11 @@ static void restore_char (char **c, const unsigned char *d, int *off) return; } - *c = mem_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; @@ -188,14 +156,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 = mem_malloc (sizeof (ADDRESS)); + *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); @@ -206,7 +174,7 @@ static void restore_address (ADDRESS ** a, const unsigned char *d, int *off) *a = NULL; } -static unsigned char *dump_list (LIST * l, unsigned char *d, int *off) +static unsigned char *dump_list (string_list_t * l, unsigned char *d, int *off) { unsigned int counter = 0; unsigned int start_off = *off; @@ -224,14 +192,14 @@ static unsigned char *dump_list (LIST * l, unsigned char *d, int *off) return d; } -static void restore_list (LIST ** l, const unsigned char *d, int *off) +static void restore_list (string_list_t ** l, const unsigned char *d, int *off) { unsigned int counter; restore_int (&counter, d, off); while (counter) { - *l = mem_malloc (sizeof (LIST)); + *l = p_new(string_list_t, 1); restore_char (&(*l)->data, d, off); l = &(*l)->next; counter--; @@ -240,45 +208,6 @@ static void restore_list (LIST ** l, const unsigned char *d, int *off) *l = NULL; } -#if 0 -static unsigned char *dump_buffer (BUFFER * b, unsigned char *d, int *off) -{ - if (!b) { - d = dump_int (0, d, off); - return d; - } - else { - d = dump_int (1, d, off); - } - - d = dump_char_size (b->data, d, off, b->dsize + 1); - d = dump_int (b->dptr - b->data, d, off); - d = dump_int (b->dsize, d, off); - d = dump_int (b->destroy, d, off); - - return d; -} - -static void restore_buffer (BUFFER ** b, const unsigned char *d, int *off) -{ - unsigned int used; - unsigned int offset; - - restore_int (&used, d, off); - if (!used) { - return; - } - - *b = mem_malloc (sizeof (BUFFER)); - - restore_char (&(*b)->data, d, off); - restore_int (&offset, d, off); - (*b)->dptr = (*b)->data + offset; - restore_int (&(*b)->dsize, d, off); - restore_int ((unsigned int *) &(*b)->destroy, d, off); -} -#endif - static unsigned char *dump_parameter (PARAMETER * p, unsigned char *d, int *off) { @@ -307,14 +236,12 @@ restore_parameter (PARAMETER ** p, const unsigned char *d, int *off) restore_int (&counter, d, off); while (counter) { - *p = mem_malloc (sizeof (PARAMETER)); + *p = parameter_new(); restore_char (&(*p)->attribute, d, off); restore_char (&(*p)->value, d, off); p = &(*p)->next; counter--; } - - *p = NULL; } static unsigned char *dump_body (BODY * c, unsigned char *d, int *off) @@ -374,6 +301,7 @@ 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); @@ -414,7 +342,8 @@ 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); @@ -428,7 +357,7 @@ static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off) } static -unsigned int crc32 (unsigned int crc, unsigned char const *p, size_t len) +unsigned int crc32 (unsigned int crc, unsigned char const *p, ssize_t len) { int i; @@ -445,36 +374,27 @@ static int generate_crc32 () int crc = 0; crc = crc32 (crc, (unsigned char const *) - "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613", - str_len - ("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")); + 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", 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; } @@ -513,7 +433,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, @@ -570,7 +490,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); @@ -581,7 +501,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 (); @@ -592,27 +512,27 @@ 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 = mem_calloc(1, sizeof (HEADER_CACHE)); + 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') { - mem_free(&h->folder); - mem_free(&h); + p_delete(&h->folder); + p_delete(&h); return NULL; } @@ -626,8 +546,8 @@ mutt_hcache_open(const char *path, const char *folder) return h; else { - mem_free(&h->folder); - mem_free(&h); + p_delete(&h->folder); + p_delete(&h); return NULL; } @@ -642,13 +562,13 @@ mutt_hcache_close(void *db) return; vlclose(h->db); - mem_free(&h->folder); - mem_free(&h); + p_delete(&h->folder); + p_delete(&h); } void * mutt_hcache_fetch(void *db, const char *filename, - size_t(*keylen) (const char *fn)) + ssize_t(*keylen) (const char *fn)) { struct header_cache *h = db; char path[_POSIX_PATH_MAX]; @@ -658,16 +578,16 @@ 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)) { - mem_free(&data); + p_delete(&data); return NULL; } @@ -677,7 +597,7 @@ mutt_hcache_fetch(void *db, const char *filename, int mutt_hcache_store(void *db, const char *filename, HEADER * header, unsigned long uid_validity, - size_t(*keylen) (const char *fn)) + ssize_t(*keylen) (const char *fn)) { struct header_cache *h = db; char path[_POSIX_PATH_MAX]; @@ -688,8 +608,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)); @@ -697,14 +617,14 @@ mutt_hcache_store(void *db, const char *filename, HEADER * header, ret = vlput(h->db, path, ksize, data, dsize, VL_DOVER); - mem_free(&data); + p_delete(&data); return ret; } int mutt_hcache_delete(void *db, const char *filename, - size_t(*keylen) (const char *fn)) + ssize_t(*keylen) (const char *fn)) { struct header_cache *h = db; char path[_POSIX_PATH_MAX]; @@ -713,28 +633,28 @@ 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) { - struct header_cache *h = mem_calloc (1, sizeof (HEADER_CACHE)); + struct header_cache *h = p_new(struct header_cache, 1); 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') { - mem_free (&h->folder); - mem_free (&h); + p_delete(&h->folder); + p_delete(&h); return NULL; } @@ -751,8 +671,8 @@ void *mutt_hcache_open (const char *path, const char *folder) return h; } else { - mem_free (&h->folder); - mem_free (&h); + p_delete(&h->folder); + p_delete(&h); return NULL; } @@ -767,12 +687,12 @@ void mutt_hcache_close (void *db) } gdbm_close (h->db); - mem_free (&h->folder); - mem_free (&h); + p_delete(&h->folder); + p_delete(&h); } void *mutt_hcache_fetch (void *db, const char *filename, - size_t (*keylen) (const char *fn)) + ssize_t (*keylen) (const char *fn)) { struct header_cache *h = db; datum key; @@ -783,8 +703,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); @@ -792,7 +712,7 @@ void *mutt_hcache_fetch (void *db, const char *filename, data = gdbm_fetch (h->db, key); if (!crc32_matches (data.dptr, h->crc)) { - mem_free(&data.dptr); + p_delete(&data.dptr); return NULL; } @@ -801,7 +721,7 @@ void *mutt_hcache_fetch (void *db, const char *filename, int mutt_hcache_store (void *db, const char *filename, HEADER * header, - unsigned long uid_validity, size_t (*keylen) (const char *fn)) + unsigned long uid_validity, ssize_t (*keylen) (const char *fn)) { struct header_cache *h = db; datum key; @@ -813,8 +733,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); @@ -823,14 +743,14 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header, ret = gdbm_store (h->db, key, data, GDBM_REPLACE); - mem_free (&data.dptr); + p_delete(&data.dptr); return ret; } int mutt_hcache_delete (void *db, const char *filename, - size_t (*keylen) (const char *fn)) + ssize_t (*keylen) (const char *fn)) { datum key; struct header_cache *h = db; @@ -840,17 +760,17 @@ 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) +static void mutt_hcache_dbt_init (DBT * dbt, void *data, ssize_t len) { dbt->data = data; dbt->size = dbt->ulen = len; @@ -870,14 +790,14 @@ void *mutt_hcache_open (const char *path, const char *folder) struct stat sb; u_int32_t createflags = DB_CREATE; int ret; - struct header_cache *h = calloc (1, sizeof (HEADER_CACHE)); + struct header_cache *h = p_new(struct header_cache, 1); int pagesize = atoi (HeaderCachePageSize); h->crc = generate_crc32 (); if (!path || path[0] == '\0') { - mem_free (&h); + p_delete(&h); return NULL; } @@ -887,13 +807,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) { - mem_free (&h); + p_delete(&h); return NULL; } if (mx_lock_file (h->lockfile, h->fd, 1, 0, 5)) { close (h->fd); - mem_free (&h); + p_delete(&h); return NULL; } @@ -901,7 +821,7 @@ void *mutt_hcache_open (const char *path, const char *folder) if (ret) { mx_unlock_file (h->lockfile, h->fd, 0); close (h->fd); - mem_free (&h); + p_delete(&h); return NULL; } @@ -913,7 +833,7 @@ void *mutt_hcache_open (const char *path, const char *folder) h->env->close (h->env, 0); mx_unlock_file (h->lockfile, h->fd, 0); close (h->fd); - mem_free (&h); + p_delete(&h); return NULL; } } @@ -929,7 +849,7 @@ void *mutt_hcache_open (const char *path, const char *folder) h->env->close (h->env, 0); mx_unlock_file (h->lockfile, h->fd, 0); close (h->fd); - mem_free (&h); + p_delete(&h); return NULL; } @@ -948,11 +868,11 @@ void mutt_hcache_close (void *db) h->env->close (h->env, 0); mx_unlock_file (h->lockfile, h->fd, 0); close (h->fd); - mem_free (&h); + p_delete(&h); } void *mutt_hcache_fetch (void *db, const char *filename, - size_t (*keylen) (const char *fn)) + ssize_t (*keylen) (const char *fn)) { DBT key; DBT data; @@ -971,7 +891,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)) { - mem_free(&data.data); + p_delete(&data.data); return NULL; } @@ -980,7 +900,7 @@ void *mutt_hcache_fetch (void *db, const char *filename, int mutt_hcache_store (void *db, const char *filename, HEADER * header, - unsigned long uid_validity, size_t (*keylen) (const char *fn)) + unsigned long uid_validity, ssize_t (*keylen) (const char *fn)) { DBT key; DBT data; @@ -1003,14 +923,14 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header, ret = h->db->put (h->db, NULL, &key, &data, 0); - mem_free (&data.data); + p_delete(&data.data); return ret; } int mutt_hcache_delete (void *db, const char *filename, - size_t (*keylen) (const char *fn)) + ssize_t (*keylen) (const char *fn)) { DBT key; struct header_cache *h = db;