#ifdef USE_HCACHE
-#if HAVE_GDBM
+#if HAVE_QDBM
+#include <depot.h>
+#include <cabin.h>
+#include <villa.h>
+#elif HAVE_GDBM
#include <gdbm.h>
#elif HAVE_DB4
#include <db.h>
#include "lib.h"
#include "md5.h"
-#if HAVE_GDBM
+#include "lib/mem.h"
+#include "lib/debug.h"
+
+#if HAVE_QDBM
+static struct
+ header_cache {
+ VILLA *db;
+ char *folder;
+ unsigned int crc;
+} HEADER_CACHE;
+#elif HAVE_GDBM
static struct
header_cache {
GDBM_FILE db;
typedef union {
struct timeval timeval;
- uint64_t uid_validity;
+ unsigned long uid_validity;
} validate;
static void *lazy_malloc (size_t siz)
return d;
}
- size = mutt_strlen (c) + 1;
+ size = safe_strlen (c) + 1;
d = dump_int (size, d, off);
lazy_realloc (&d, *off + size);
memcpy (d + *off, c, size);
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);
while (counter) {
*a = safe_malloc (sizeof (ADDRESS));
-#ifdef EXACT_ADDRESS
- restore_char (&(*a)->val, d, off);
-#endif
restore_char (&(*a)->personal, d, off);
restore_char (&(*a)->mailbox, d, off);
restore_int ((unsigned int *) &(*a)->group, d, off);
d = dump_char (e->date, d, off);
d = dump_char (e->x_label, 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);
d = dump_list (e->userhdrs, d, off);
restore_char (&e->supersedes, d, off);
restore_char (&e->date, d, off);
restore_char (&e->x_label, 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);
crc = crc32 (crc, (unsigned char const *)
"sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613",
- mutt_strlen
+ safe_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 *) Charset, safe_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"));
+ safe_strlen ("HAVE_LANGINFO_CODESET"));
#endif
#ifdef USE_POP
crc =
- crc32 (crc, (unsigned char const *) "USE_POP", mutt_strlen ("USE_POP"));
+ crc32 (crc, (unsigned char const *) "USE_POP", safe_strlen ("USE_POP"));
#endif
#ifdef MIXMASTER
crc =
crc32 (crc, (unsigned char const *) "MIXMASTER",
- mutt_strlen ("MIXMASTER"));
+ safe_strlen ("MIXMASTER"));
#endif
#ifdef USE_IMAP
crc =
- crc32 (crc, (unsigned char const *) "USE_IMAP", mutt_strlen ("USE_IMAP"));
+ crc32 (crc, (unsigned char const *) "USE_IMAP", safe_strlen ("USE_IMAP"));
+#endif
+
+#ifdef USE_NNTP
+ crc =
+ crc32 (crc, (unsigned char const *) "USE_NNTP", safe_strlen ("USE_NNTP"));
#endif
return crc;
}
}
MD5Init (&md5);
- MD5Update (&md5, (unsigned char *) folder, mutt_strlen (folder));
+ MD5Update (&md5, (unsigned char *) folder, safe_strlen (folder));
MD5Final (md5sum, &md5);
ret = snprintf (mutt_hcache_per_folder_path, _POSIX_PATH_MAX,
/* 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;
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;
return h;
}
-#if HAVE_GDBM
+#if HAVE_QDBM
+void *
+mutt_hcache_open(const char *path, const char *folder)
+{
+ struct header_cache *h = safe_calloc(1, sizeof (HEADER_CACHE));
+ int flags = VL_OWRITER | VL_OCREAT;
+ h->db = NULL;
+ h->folder = safe_strdup(folder);
+ h->crc = generate_crc32();
+
+ if (!path || path[0] == '\0')
+ {
+ FREE(&h->folder);
+ FREE(&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
+ {
+ FREE(&h->folder);
+ FREE(&h);
+
+ return NULL;
+ }
+}
+
+void
+mutt_hcache_close(void *db)
+{
+ struct header_cache *h = db;
+
+ if (!h)
+ return;
+
+ vlclose(h->db);
+ FREE(&h->folder);
+ FREE(&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;
+
+ strncpy(path, h->folder, sizeof (path));
+ safe_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))
+ {
+ FREE(&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;
+
+ strncpy(path, h->folder, sizeof (path));
+ safe_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);
+
+ FREE(&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;
+
+ strncpy(path, h->folder, sizeof (path));
+ safe_strcat(path, sizeof (path), filename);
+
+ ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
+
+ return vlout(h->db, path, ksize);
+}
+
+#elif HAVE_GDBM
void *mutt_hcache_open (const char *path, const char *folder)
{
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - mutt_strlen (path));
+ strncat (path, filename, sizeof (path) - safe_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);
+ FREE(&data.dptr);
return NULL;
}
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;
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - mutt_strlen (path));
+ strncat (path, filename, sizeof (path) - safe_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - mutt_strlen (path));
+ strncat (path, filename, sizeof (path) - safe_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
h->db->get (h->db, NULL, &key, &data, 0);
if (!crc32_matches (data.data, h->crc)) {
- free (data.data);
+ FREE(&data.data);
return NULL;
}
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;
projects / apps / madmutt.git / blobdiff