#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"
{
struct header_cache *h = db;
char path[_POSIX_PATH_MAX];
- int ksize;
+ int ksize, len;
char *data = NULL;
if (!h)
return NULL;
m_strcpy(path, sizeof(path), h->folder);
- str_cat(path, sizeof (path), filename);
+ 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;
return -1;
m_strcpy(path, sizeof(path), h->folder);
- str_cat(path, sizeof (path), filename);
+ m_strcat(path, sizeof(path), filename);
ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
return -1;
m_strcpy(path, sizeof(path), h->folder);
- str_cat(path, sizeof (path), filename);
+ m_strcat(path, sizeof(path), filename);
ksize = strlen(h->folder) + keylen(path + strlen(h->folder));