* 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
+#define MUTTNG_HCACHE_ID "0x004"
+
+# ifdef HAVE_INTTYPES_H
# include <inttypes.h>
# else
-# if HAVE_STDINT_H
+# ifdef HAVE_STDINT_H
# include <stdint.h>
# endif
# endif
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#ifdef USE_HCACHE
-
-#if HAVE_GDBM
+#if defined(HAVE_QDBM)
+#include <depot.h>
+#include <cabin.h>
+#include <villa.h>
+#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-lib/macros.h>
+#include <lib-hash/hash.h>
+
+#include <lib-mime/mime.h>
+
+#include "charset.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"
-#if HAVE_GDBM
-static struct
- header_cache {
+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
+};
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 safe_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;
- }
-
- safe_realloc (ptr, siz);
+ p_realloc(p, UPPER4K(siz));
}
static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off)
return d;
}
- size = safe_strlen (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);
return d;
}
-#endif
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;
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);
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);
*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;
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 = safe_malloc (sizeof (LIST));
+ *l = p_new(string_list_t, 1);
restore_char (&(*l)->data, d, off);
l = &(*l)->next;
counter--;
*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 = safe_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)
{
restore_int (&counter, d, off);
while (counter) {
- *p = safe_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)
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);
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);
}
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;
int crc = 0;
crc = crc32 (crc, (unsigned char const *)
- "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613",
- safe_strlen
- ("sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
-
-#if HAVE_LANGINFO_CODESET
- crc = crc32 (crc, (unsigned char const *) Charset, safe_strlen (Charset));
- crc =
- crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
- safe_strlen ("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
-#if EXACT_ADDRESS
- crc =
- crc32 (crc, (unsigned char const *) "EXACT_ADDRESS",
- safe_strlen ("EXACT_ADDRESS"));
-#endif
-
-#ifdef USE_POP
- crc =
- crc32 (crc, (unsigned char const *) "USE_POP", safe_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",
- safe_strlen ("MIXMASTER"));
+ crc = crc32(crc, (unsigned char const *) "MIXMASTER",
+ m_strlen("MIXMASTER"));
#endif
-#ifdef USE_IMAP
- crc =
- crc32 (crc, (unsigned char const *) "USE_IMAP", safe_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;
}
}
MD5Init (&md5);
- MD5Update (&md5, (unsigned char *) folder, safe_strlen (folder));
+ MD5Update (&md5, (unsigned char *) folder, m_strlen(folder));
MD5Final (md5sum, &md5);
ret = snprintf (mutt_hcache_per_folder_path, _POSIX_PATH_MAX,
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);
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 ();
/* 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,
+ ssize_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,
+ ssize_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,
+ ssize_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(struct 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;
}
return h;
}
else {
- FREE (&h->folder);
- FREE (&h);
+ p_delete(&h->folder);
+ p_delete(&h);
return NULL;
}
}
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,
- size_t (*keylen) (const char *fn))
+ ssize_t (*keylen) (const char *fn))
{
struct header_cache *h = db;
datum key;
return NULL;
}
- strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - safe_strlen (path));
+ m_strcpy(path, sizeof(path), h->folder);
+ strncat (path, filename, sizeof (path) - m_strlen(path));
key.dptr = path;
key.dsize = keylen (path);
data = gdbm_fetch (h->db, key);
if (!crc32_matches (data.dptr, h->crc)) {
- free (data.dptr);
+ p_delete(&data.dptr);
return NULL;
}
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;
return -1;
}
- strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - safe_strlen (path));
+ m_strcpy(path, sizeof(path), h->folder);
+ strncat (path, filename, sizeof (path) - m_strlen(path));
key.dptr = path;
key.dsize = keylen (path);
ret = gdbm_store (h->db, key, data, GDBM_REPLACE);
- 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;
return -1;
}
- strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - safe_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)
+static void mutt_hcache_dbt_init (DBT * dbt, void *data, ssize_t len)
{
dbt->data = data;
dbt->size = dbt->ulen = len;
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') {
- FREE (&h);
+ p_delete(&h);
return NULL;
}
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;
}
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;
}
}
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;
}
void mutt_hcache_close (void *db)
{
struct header_cache *h = db;
- int ret;
if (!h) {
return;
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,
- size_t (*keylen) (const char *fn))
+ ssize_t (*keylen) (const char *fn))
{
DBT key;
DBT data;
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;
}
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;
ret = h->db->put (h->db, NULL, &key, &data, 0);
- 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;
projects / apps / madmutt.git / blobdiff