#ifdef USE_HCACHE
-#define MUTTNG_HCACHE_ID "0x002"
+#define MUTTNG_HCACHE_ID "0x004"
-# if HAVE_INTTYPES_H
+# ifdef HAVE_INTTYPES_H
# include <inttypes.h>
# else
-# if HAVE_STDINT_H
+# ifdef HAVE_STDINT_H
# include <stdint.h>
# endif
# endif
-#if HAVE_QDBM
+#if defined(HAVE_QDBM)
#include <depot.h>
#include <cabin.h>
#include <villa.h>
-#elif HAVE_GDBM
+#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-hash/hash.h>
+#include <lib-lib/debug.h>
+
+#include <lib-mime/mime.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"
-#include "lib/debug.h"
-#if HAVE_QDBM
-static struct
- header_cache {
+static 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
+} HEADER_CACHE;
typedef union {
struct timeval timeval;
unsigned long uid_validity;
} validate;
-static void *lazy_malloc (size_t siz)
+static void *lazy_malloc (ssize_t siz)
{
if (0 < siz && siz < 4096) {
siz = 4096;
}
- return mem_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;
+ char **p = ptr;
if (p != NULL && 0 < siz && siz < 4096) {
return;
}
- mem_realloc (ptr, siz);
+ p_realloc(&p, siz);
}
static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off)
return d;
}
- size = str_len (c) + 1;
+ size = m_strlen(c) + 1;
d = dump_int (size, d, off);
lazy_realloc (&d, *off + size);
memcpy (d + *off, c, size);
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;
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);
*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 = mem_malloc (sizeof (LIST));
+ *l = p_new(string_list_t, 1);
restore_char (&(*l)->data, d, off);
l = &(*l)->next;
counter--;
return;
}
- *b = mem_malloc (sizeof (BUFFER));
+ *b = p_new(BUFFER, 1);
restore_char (&(*b)->data, d, off);
restore_int (&offset, d, off);
restore_int (&counter, d, off);
while (counter) {
- *p = mem_malloc (sizeof (PARAMETER));
+ *p = p_new(PARAMETER, 1);
restore_char (&(*p)->attribute, d, off);
restore_char (&(*p)->value, d, off);
p = &(*p)->next;
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);
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);
}
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;
crc = crc32 (crc, (unsigned char const *)
MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613",
- str_len
+ 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, str_len (Charset));
- crc =
- crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
- str_len ("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", 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;
}
}
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,
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 = 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;
}
return h;
else
{
- mem_free(&h->folder);
- mem_free(&h);
+ p_delete(&h->folder);
+ p_delete(&h);
return NULL;
}
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];
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;
}
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];
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));
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];
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(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;
}
return h;
}
else {
- mem_free (&h->folder);
- mem_free (&h);
+ p_delete(&h->folder);
+ p_delete(&h);
return NULL;
}
}
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;
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);
data = gdbm_fetch (h->db, key);
if (!crc32_matches (data.dptr, h->crc)) {
- mem_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) - 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);
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;
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;
h->crc = generate_crc32 ();
if (!path || path[0] == '\0') {
- mem_free (&h);
+ p_delete(&h);
return NULL;
}
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;
}
if (ret) {
mx_unlock_file (h->lockfile, h->fd, 0);
close (h->fd);
- mem_free (&h);
+ p_delete(&h);
return NULL;
}
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;
}
}
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;
}
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;
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;
}
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);
- 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;
projects / apps / madmutt.git / blobdiff