#include <lib-lib/mem.h>
#include <lib-hash/hash.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"
*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 = 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);
(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"));
+ 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;
}
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 ();
if (oh) {
h->old = (*oh)->old;
h->path = m_strdup((*oh)->path);
- mutt_free_header (oh);
+ header_delete(oh);
}
return h;
{
struct header_cache *h = db;
char path[_POSIX_PATH_MAX];
- int ksize;
+ int ksize, len;
char *data = NULL;
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;
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));
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 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;
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;
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;