X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=da3d6bbc08b9b7b3198c9ebac9619b3bafae088f;hp=6cf01e6f8f6c6621477899b873b1997f0df00569;hb=01bd0a7410e476abaebf03d820bcf31a5ec4c7c0;hpb=0c12d960399d14b4143b2bb91a96bdaca64e4c56 diff --git a/hcache.c b/hcache.c index 6cf01e6..da3d6bb 100644 --- a/hcache.c +++ b/hcache.c @@ -16,91 +16,75 @@ #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_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 "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 xmalloc(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; - } - - p_realloc(ptr, siz); + p_realloc(p, UPPER4K(siz)); } static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off) @@ -137,25 +121,6 @@ static unsigned char *dump_char (char *c, unsigned char *d, int *off) 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; - } - - d = dump_int (size, d, off); - lazy_realloc (&d, *off + size); - memcpy (d + *off, c, size); - *off += size; - - return d; -} -#endif - static void restore_char (char **c, const unsigned char *d, int *off) { unsigned int size; @@ -171,7 +136,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; @@ -191,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 = 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); @@ -209,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; @@ -227,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 = p_new(LIST, 1); + *l = p_new(string_list_t, 1); restore_char (&(*l)->data, d, off); l = &(*l)->next; counter--; @@ -243,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 = p_new(BUFFER, 1); - - 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) { @@ -310,14 +236,12 @@ restore_parameter (PARAMETER ** p, const unsigned char *d, int *off) restore_int (&counter, d, off); while (counter) { - *p = p_new(PARAMETER, 1); + *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) @@ -433,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; @@ -454,32 +378,23 @@ static int generate_crc32 () 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, m_strlen(Charset)); - crc = - crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET", - m_strlen("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", m_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", - m_strlen("MIXMASTER")); + crc = crc32(crc, (unsigned char const *) "MIXMASTER", + m_strlen("MIXMASTER")); #endif -#ifdef USE_IMAP - crc = - crc32 (crc, (unsigned char const *) "USE_IMAP", m_strlen("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", m_strlen("USE_NNTP")); + crc = crc32(crc, (unsigned char const *) "USE_NNTP", m_strlen("USE_NNTP")); #endif return crc; } @@ -575,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); @@ -586,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 (); @@ -598,17 +513,17 @@ HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh) if (oh) { h->old = (*oh)->old; h->path = m_strdup((*oh)->path); - mutt_free_header (oh); + 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 = m_strdup(folder); @@ -653,7 +568,7 @@ mutt_hcache_close(void *db) 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]; @@ -663,14 +578,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; @@ -682,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]; @@ -693,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)); @@ -709,7 +624,7 @@ mutt_hcache_store(void *db, const char *filename, HEADER * header, 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]; @@ -718,19 +633,19 @@ 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 = p_new(HEADER_CACHE, 1); + struct header_cache *h = p_new(struct header_cache, 1); int pagesize = atoi (HeaderCachePageSize) ? atoi (HeaderCachePageSize) : 16384; h->db = NULL; @@ -777,7 +692,7 @@ void mutt_hcache_close (void *db) } 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; @@ -788,7 +703,7 @@ void *mutt_hcache_fetch (void *db, const char *filename, return NULL; } - strncpy (path, h->folder, sizeof (path)); + m_strcpy(path, sizeof(path), h->folder); strncat (path, filename, sizeof (path) - m_strlen(path)); key.dptr = path; @@ -806,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; @@ -818,7 +733,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header, return -1; } - strncpy (path, h->folder, sizeof (path)); + m_strcpy(path, sizeof(path), h->folder); strncat (path, filename, sizeof (path) - m_strlen(path)); key.dptr = path; @@ -835,7 +750,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header, 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; @@ -845,7 +760,7 @@ mutt_hcache_delete (void *db, const char *filename, return -1; } - strncpy (path, h->folder, sizeof (path)); + m_strcpy(path, sizeof(path), h->folder); strncat (path, filename, sizeof (path) - m_strlen(path)); key.dptr = path; @@ -853,9 +768,9 @@ mutt_hcache_delete (void *db, const char *filename, 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; @@ -875,7 +790,7 @@ 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); @@ -957,7 +872,7 @@ void mutt_hcache_close (void *db) } 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; @@ -985,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; @@ -1015,7 +930,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header, 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;