* 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
# include <inttypes.h>
# endif
# endif
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#ifdef USE_HCACHE
-
#if HAVE_QDBM
#include <depot.h>
#include <cabin.h>
siz = 4096;
}
- return safe_malloc (siz);
+ return mem_malloc (siz);
}
static void lazy_realloc (void *ptr, size_t siz)
return;
}
- safe_realloc (ptr, siz);
+ mem_realloc (ptr, siz);
}
static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off)
return d;
}
- size = safe_strlen (c) + 1;
+ size = str_len (c) + 1;
d = dump_int (size, d, off);
lazy_realloc (&d, *off + size);
memcpy (d + *off, c, size);
return;
}
- *c = safe_malloc (size);
+ *c = mem_malloc (size);
memcpy (*c, d + *off, size);
*off += 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);
restore_int (&counter, d, off);
while (counter) {
- *a = safe_malloc (sizeof (ADDRESS));
-#ifdef EXACT_ADDRESS
- restore_char (&(*a)->val, d, off);
-#endif
+ *a = mem_malloc (sizeof (ADDRESS));
restore_char (&(*a)->personal, d, off);
restore_char (&(*a)->mailbox, d, off);
restore_int ((unsigned int *) &(*a)->group, d, off);
restore_int (&counter, d, off);
while (counter) {
- *l = safe_malloc (sizeof (LIST));
+ *l = mem_malloc (sizeof (LIST));
restore_char (&(*l)->data, d, off);
l = &(*l)->next;
counter--;
return;
}
- *b = safe_malloc (sizeof (BUFFER));
+ *b = mem_malloc (sizeof (BUFFER));
restore_char (&(*b)->data, d, off);
restore_int (&offset, d, off);
restore_int (&counter, d, off);
while (counter) {
- *p = safe_malloc (sizeof (PARAMETER));
+ *p = mem_malloc (sizeof (PARAMETER));
restore_char (&(*p)->attribute, d, off);
restore_char (&(*p)->value, d, off);
p = &(*p)->next;
crc = crc32 (crc, (unsigned char const *)
"sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613",
- safe_strlen
+ str_len
("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 *) Charset, str_len (Charset));
crc =
crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
- safe_strlen ("HAVE_LANGINFO_CODESET"));
-#endif
-
-#if EXACT_ADDRESS
- crc =
- crc32 (crc, (unsigned char const *) "EXACT_ADDRESS",
- safe_strlen ("EXACT_ADDRESS"));
+ str_len ("HAVE_LANGINFO_CODESET"));
#endif
#ifdef USE_POP
crc =
- crc32 (crc, (unsigned char const *) "USE_POP", safe_strlen ("USE_POP"));
+ crc32 (crc, (unsigned char const *) "USE_POP", str_len ("USE_POP"));
#endif
#ifdef MIXMASTER
crc =
crc32 (crc, (unsigned char const *) "MIXMASTER",
- safe_strlen ("MIXMASTER"));
+ str_len ("MIXMASTER"));
#endif
#ifdef USE_IMAP
crc =
- crc32 (crc, (unsigned char const *) "USE_IMAP", safe_strlen ("USE_IMAP"));
+ crc32 (crc, (unsigned char const *) "USE_IMAP", str_len ("USE_IMAP"));
#endif
#ifdef USE_NNTP
crc =
- crc32 (crc, (unsigned char const *) "USE_NNTP", safe_strlen ("USE_NNTP"));
+ crc32 (crc, (unsigned char const *) "USE_NNTP", str_len ("USE_NNTP"));
#endif
return crc;
}
}
MD5Init (&md5);
- MD5Update (&md5, (unsigned char *) folder, safe_strlen (folder));
+ MD5Update (&md5, (unsigned char *) folder, str_len (folder));
MD5Final (md5sum, &md5);
ret = snprintf (mutt_hcache_per_folder_path, _POSIX_PATH_MAX,
/* this is needed for maildir style mailboxes */
if (oh) {
h->old = (*oh)->old;
- h->path = safe_strdup ((*oh)->path);
+ h->path = str_dup ((*oh)->path);
mutt_free_header (oh);
}
void *
mutt_hcache_open(const char *path, const char *folder)
{
- struct header_cache *h = safe_calloc(1, sizeof (HEADER_CACHE));
- int flags = 0;
-#if 0 /* FIXME */
- int pagesize = atoi(HeaderCachePageSize) ? atoi(HeaderCachePageSize) : 16384;
-#endif
+ struct header_cache *h = mem_calloc(1, sizeof (HEADER_CACHE));
+ int flags = VL_OWRITER | VL_OCREAT;
h->db = NULL;
- h->folder = safe_strdup(folder);
+ h->folder = str_dup(folder);
h->crc = generate_crc32();
if (!path || path[0] == '\0')
{
- FREE(&h->folder);
- FREE(&h);
+ mem_free(&h->folder);
+ mem_free(&h);
return NULL;
}
path = mutt_hcache_per_folder(path, folder);
if (option(OPTHCACHECOMPRESS))
- flags = VL_OZCOMP;
+ flags |= VL_OZCOMP;
- h->db = vlopen(path, flags | VL_OWRITER | VL_OCREAT, VL_CMPLEX);
- if (h->db)
- return h;
-
- /* if rw failed try ro */
- h->db = vlopen(path, flags | VL_OREADER, VL_CMPLEX);
+ h->db = vlopen(path, flags, VL_CMPLEX);
if (h->db)
return h;
else
{
- FREE(&h->folder);
- FREE(&h);
+ mem_free(&h->folder);
+ mem_free(&h);
return NULL;
}
return;
vlclose(h->db);
- FREE(&h->folder);
- FREE(&h);
+ mem_free(&h->folder);
+ mem_free(&h);
}
void *
return NULL;
strncpy(path, h->folder, sizeof (path));
- safe_strcat(path, sizeof (path), filename);
+ str_cat(path, sizeof (path), filename);
ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
if (! crc32_matches(data, h->crc))
{
- if (data) {
- FREE(&data);
- }
+ mem_free(&data);
return NULL;
}
return -1;
strncpy(path, h->folder, sizeof (path));
- safe_strcat(path, sizeof (path), filename);
+ str_cat(path, sizeof (path), filename);
ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
ret = vlput(h->db, path, ksize, data, dsize, VL_DOVER);
- FREE(&data);
+ mem_free(&data);
return ret;
}
return -1;
strncpy(path, h->folder, sizeof (path));
- safe_strcat(path, sizeof (path), filename);
+ str_cat(path, sizeof (path), filename);
ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
void *mutt_hcache_open (const char *path, const char *folder)
{
- struct header_cache *h = safe_calloc (1, sizeof (HEADER_CACHE));
+ struct header_cache *h = mem_calloc (1, sizeof (HEADER_CACHE));
int pagesize =
atoi (HeaderCachePageSize) ? atoi (HeaderCachePageSize) : 16384;
h->db = NULL;
- h->folder = safe_strdup (folder);
+ h->folder = str_dup (folder);
h->crc = generate_crc32 ();
if (!path || path[0] == '\0') {
- FREE (&h->folder);
- FREE (&h);
+ mem_free (&h->folder);
+ mem_free (&h);
return NULL;
}
return h;
}
else {
- FREE (&h->folder);
- FREE (&h);
+ mem_free (&h->folder);
+ mem_free (&h);
return NULL;
}
}
gdbm_close (h->db);
- FREE (&h->folder);
- FREE (&h);
+ mem_free (&h->folder);
+ mem_free (&h);
}
void *mutt_hcache_fetch (void *db, const char *filename,
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - safe_strlen (path));
+ strncat (path, filename, sizeof (path) - str_len (path));
key.dptr = path;
key.dsize = keylen (path);
data = gdbm_fetch (h->db, key);
if (!crc32_matches (data.dptr, h->crc)) {
- free (data.dptr);
+ mem_free(&data.dptr);
return NULL;
}
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - safe_strlen (path));
+ strncat (path, filename, sizeof (path) - str_len (path));
key.dptr = path;
key.dsize = keylen (path);
ret = gdbm_store (h->db, key, data, GDBM_REPLACE);
- FREE (&data.dptr);
+ mem_free (&data.dptr);
return ret;
}
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) - safe_strlen (path));
+ strncat (path, filename, sizeof (path) - str_len (path));
key.dptr = path;
key.dsize = keylen (path);
h->crc = generate_crc32 ();
if (!path || path[0] == '\0') {
- FREE (&h);
+ mem_free (&h);
return NULL;
}
h->fd = open (h->lockfile, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
if (h->fd < 0) {
- FREE (&h);
+ mem_free (&h);
return NULL;
}
if (mx_lock_file (h->lockfile, h->fd, 1, 0, 5)) {
close (h->fd);
- FREE (&h);
+ mem_free (&h);
return NULL;
}
if (ret) {
mx_unlock_file (h->lockfile, h->fd, 0);
close (h->fd);
- FREE (&h);
+ mem_free (&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);
+ mem_free (&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);
+ mem_free (&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);
+ mem_free (&h);
}
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)) {
- free (data.data);
+ mem_free(&data.data);
return NULL;
}
ret = h->db->put (h->db, NULL, &key, &data, 0);
- FREE (&data.data);
+ mem_free (&data.data);
return ret;
}