projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
hcache.c
diff --git
a/hcache.c
b/hcache.c
index
e5227af
..
5e26743
100644
(file)
--- a/
hcache.c
+++ b/
hcache.c
@@
-43,6
+43,8
@@
#include "lib.h"
#include "md5.h"
#include "lib.h"
#include "md5.h"
+#include "lib/mem.h"
+
#if HAVE_GDBM
static struct
header_cache {
#if HAVE_GDBM
static struct
header_cache {
@@
-63,7
+65,7
@@
static struct
typedef union {
struct timeval timeval;
typedef union {
struct timeval timeval;
- u
int64_t
uid_validity;
+ u
nsigned long
uid_validity;
} validate;
static void *lazy_malloc (size_t siz)
} validate;
static void *lazy_malloc (size_t siz)
@@
-111,7
+113,7
@@
static unsigned char *dump_char (char *c, unsigned char *d, int *off)
return d;
}
return d;
}
- size =
mutt
_strlen (c) + 1;
+ size =
safe
_strlen (c) + 1;
d = dump_int (size, d, off);
lazy_realloc (&d, *off + size);
memcpy (d + *off, c, size);
d = dump_int (size, d, off);
lazy_realloc (&d, *off + size);
memcpy (d + *off, c, size);
@@
-425,36
+427,36
@@
static int generate_crc32 ()
crc = crc32 (crc, (unsigned char const *)
"sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613",
crc = crc32 (crc, (unsigned char const *)
"sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613",
-
mutt
_strlen
+
safe
_strlen
("sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
#if HAVE_LANGINFO_CODESET
("sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
#if HAVE_LANGINFO_CODESET
- crc = crc32 (crc, (unsigned char const *) Charset,
mutt
_strlen (Charset));
+ crc = crc32 (crc, (unsigned char const *) Charset,
safe
_strlen (Charset));
crc =
crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
crc =
crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
-
mutt
_strlen ("HAVE_LANGINFO_CODESET"));
+
safe
_strlen ("HAVE_LANGINFO_CODESET"));
#endif
#if EXACT_ADDRESS
crc =
crc32 (crc, (unsigned char const *) "EXACT_ADDRESS",
#endif
#if EXACT_ADDRESS
crc =
crc32 (crc, (unsigned char const *) "EXACT_ADDRESS",
-
mutt
_strlen ("EXACT_ADDRESS"));
+
safe
_strlen ("EXACT_ADDRESS"));
#endif
#ifdef USE_POP
crc =
#endif
#ifdef USE_POP
crc =
- crc32 (crc, (unsigned char const *) "USE_POP",
mutt
_strlen ("USE_POP"));
+ crc32 (crc, (unsigned char const *) "USE_POP",
safe
_strlen ("USE_POP"));
#endif
#ifdef MIXMASTER
crc =
crc32 (crc, (unsigned char const *) "MIXMASTER",
#endif
#ifdef MIXMASTER
crc =
crc32 (crc, (unsigned char const *) "MIXMASTER",
-
mutt
_strlen ("MIXMASTER"));
+
safe
_strlen ("MIXMASTER"));
#endif
#ifdef USE_IMAP
crc =
#endif
#ifdef USE_IMAP
crc =
- crc32 (crc, (unsigned char const *) "USE_IMAP",
mutt
_strlen ("USE_IMAP"));
+ crc32 (crc, (unsigned char const *) "USE_IMAP",
safe
_strlen ("USE_IMAP"));
#endif
return crc;
}
#endif
return crc;
}
@@
-493,7
+495,7
@@
static const char *mutt_hcache_per_folder (const char *path,
}
MD5Init (&md5);
}
MD5Init (&md5);
- MD5Update (&md5, (unsigned char *) folder,
mutt
_strlen (folder));
+ MD5Update (&md5, (unsigned char *) folder,
safe
_strlen (folder));
MD5Final (md5sum, &md5);
ret = snprintf (mutt_hcache_per_folder_path, _POSIX_PATH_MAX,
MD5Final (md5sum, &md5);
ret = snprintf (mutt_hcache_per_folder_path, _POSIX_PATH_MAX,
@@
-514,7
+516,7
@@
static const char *mutt_hcache_per_folder (const char *path,
/* This function transforms a header into a char so that it is useable by
* db_store */
static void *mutt_hcache_dump (void *_db, HEADER * h, int *off,
/* This function transforms a header into a char so that it is useable by
* db_store */
static void *mutt_hcache_dump (void *_db, HEADER * h, int *off,
- u
int64_t
uid_validity)
+ u
nsigned long
uid_validity)
{
struct header_cache *db = _db;
unsigned char *d = NULL;
{
struct header_cache *db = _db;
unsigned char *d = NULL;
@@
-524,7
+526,7
@@
static void *mutt_hcache_dump (void *_db, HEADER * h, int *off,
d = lazy_malloc (sizeof (validate));
if (uid_validity) {
d = lazy_malloc (sizeof (validate));
if (uid_validity) {
- memcpy (d, &uid_validity, sizeof (u
int64_t
));
+ memcpy (d, &uid_validity, sizeof (u
nsigned long
));
}
else {
struct timeval now;
}
else {
struct timeval now;
@@
-642,7
+644,7
@@
void *mutt_hcache_fetch (void *db, const char *filename,
}
strncpy (path, h->folder, sizeof (path));
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) -
mutt
_strlen (path));
+ strncat (path, filename, sizeof (path) -
safe
_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
key.dptr = path;
key.dsize = keylen (path);
@@
-659,7
+661,7
@@
void *mutt_hcache_fetch (void *db, const char *filename,
int
mutt_hcache_store (void *db, const char *filename, HEADER * header,
int
mutt_hcache_store (void *db, const char *filename, HEADER * header,
- u
int64_t
uid_validity, size_t (*keylen) (const char *fn))
+ u
nsigned long
uid_validity, size_t (*keylen) (const char *fn))
{
struct header_cache *h = db;
datum key;
{
struct header_cache *h = db;
datum key;
@@
-672,7
+674,7
@@
mutt_hcache_store (void *db, const char *filename, HEADER * header,
}
strncpy (path, h->folder, sizeof (path));
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) -
mutt
_strlen (path));
+ strncat (path, filename, sizeof (path) -
safe
_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
key.dptr = path;
key.dsize = keylen (path);
@@
-699,7
+701,7
@@
mutt_hcache_delete (void *db, const char *filename,
}
strncpy (path, h->folder, sizeof (path));
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) -
mutt
_strlen (path));
+ strncat (path, filename, sizeof (path) -
safe
_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
key.dptr = path;
key.dsize = keylen (path);
@@
-839,7
+841,7
@@
void *mutt_hcache_fetch (void *db, const char *filename,
int
mutt_hcache_store (void *db, const char *filename, HEADER * header,
int
mutt_hcache_store (void *db, const char *filename, HEADER * header,
- u
int64_t
uid_validity, size_t (*keylen) (const char *fn))
+ u
nsigned long
uid_validity, size_t (*keylen) (const char *fn))
{
DBT key;
DBT data;
{
DBT key;
DBT data;