X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hcache.c;h=877afd093e6755d035f7f1c0ab6bb314441c2b50;hp=6cf01e6f8f6c6621477899b873b1997f0df00569;hb=bd28609f1086cc4cae0f44e2520c53b7fed542d0;hpb=0c12d960399d14b4143b2bb91a96bdaca64e4c56

diff --git a/hcache.c b/hcache.c
index 6cf01e6..877afd0 100644
--- a/hcache.c
+++ b/hcache.c
@@ -657,20 +657,20 @@ mutt_hcache_fetch(void *db, const char *filename,
 {
   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;
@@ -693,8 +693,8 @@ mutt_hcache_store(void *db, const char *filename, HEADER * header,
   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));
 
@@ -718,8 +718,8 @@ mutt_hcache_delete(void *db, const char *filename,
   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));
 
@@ -788,7 +788,7 @@ void *mutt_hcache_fetch (void *db, const char *filename,
     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;
@@ -818,7 +818,7 @@ mutt_hcache_store (void *db, const char *filename, HEADER * header,
     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;
@@ -845,7 +845,7 @@ mutt_hcache_delete (void *db, const char *filename,
     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;