projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
less horrible strncpy's
[apps/madmutt.git]
/
hcache.c
diff --git
a/hcache.c
b/hcache.c
index
c7e13ba
..
e513c76
100644
(file)
--- a/
hcache.c
+++ b/
hcache.c
@@
-41,6
+41,7
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-hash/hash.h>
#include "mutt.h"
#ifdef USE_IMAP
#include "mutt.h"
#ifdef USE_IMAP
@@
-49,7
+50,6
@@
#include "mime.h"
#include "mx.h"
#include "lib.h"
#include "mime.h"
#include "mx.h"
#include "lib.h"
-#include "md5.h"
#include "lib/debug.h"
#include "lib/debug.h"
@@
-663,7
+663,7
@@
mutt_hcache_fetch(void *db, const char *filename,
if (!h)
return NULL;
if (!h)
return NULL;
-
strncpy(path, h->folder, sizeof (path)
);
+
m_strcpy(path, sizeof(path), h->folder
);
str_cat(path, sizeof (path), filename);
ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
str_cat(path, sizeof (path), filename);
ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
@@
-693,7
+693,7
@@
mutt_hcache_store(void *db, const char *filename, HEADER * header,
if (!h)
return -1;
if (!h)
return -1;
-
strncpy(path, h->folder, sizeof (path)
);
+
m_strcpy(path, sizeof(path), h->folder
);
str_cat(path, sizeof (path), filename);
ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
str_cat(path, sizeof (path), filename);
ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
@@
-718,7
+718,7
@@
mutt_hcache_delete(void *db, const char *filename,
if (!h)
return -1;
if (!h)
return -1;
-
strncpy(path, h->folder, sizeof (path)
);
+
m_strcpy(path, sizeof(path), h->folder
);
str_cat(path, sizeof (path), filename);
ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
str_cat(path, sizeof (path), filename);
ksize = strlen(h->folder) + keylen(path + strlen(h->folder));
@@
-788,7
+788,7
@@
void *mutt_hcache_fetch (void *db, const char *filename,
return NULL;
}
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;
strncat (path, filename, sizeof (path) - m_strlen(path));
key.dptr = path;
@@
-818,7
+818,7
@@
mutt_hcache_store (void *db, const char *filename, HEADER * header,
return -1;
}
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;
strncat (path, filename, sizeof (path) - m_strlen(path));
key.dptr = path;
@@
-845,7
+845,7
@@
mutt_hcache_delete (void *db, const char *filename,
return -1;
}
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;
strncat (path, filename, sizeof (path) - m_strlen(path));
key.dptr = path;