#endif
#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 "mx.h"
#include "lib.h"
-#include "md5.h"
#include "lib/debug.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);
{
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;