projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
hcache.c
diff --git
a/hcache.c
b/hcache.c
index
2b052f3
..
5d7ef9b
100644
(file)
--- a/
hcache.c
+++ b/
hcache.c
@@
-113,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);
@@
-370,6
+370,13
@@
static unsigned char *dump_envelope (ENVELOPE * e, unsigned char *d, int *off)
d = dump_char (e->date, d, off);
d = dump_char (e->x_label, d, off);
d = dump_char (e->date, d, off);
d = dump_char (e->x_label, d, off);
+#ifdef USE_NNTP
+ d = dump_char (e->newsgroups, d, off);
+ d = dump_char (e->xref, d, off);
+ d = dump_char (e->followup_to, d, off);
+ d = dump_char (e->x_comment_to, d, off);
+#endif
+
d = dump_list (e->references, d, off);
d = dump_list (e->in_reply_to, d, off);
d = dump_list (e->userhdrs, d, off);
d = dump_list (e->references, d, off);
d = dump_list (e->in_reply_to, d, off);
d = dump_list (e->userhdrs, d, off);
@@
-402,6
+409,13
@@
static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off)
restore_char (&e->supersedes, d, off);
restore_char (&e->date, d, off);
restore_char (&e->x_label, d, off);
restore_char (&e->supersedes, d, off);
restore_char (&e->date, d, off);
restore_char (&e->x_label, d, off);
+
+#ifdef USE_NNTP
+ restore_char (&e->newsgroups, d, off);
+ restore_char (&e->xref, d, off);
+ restore_char (&e->followup_to, d, off);
+ restore_char (&e->x_comment_to, d, off);
+#endif
restore_list (&e->references, d, off);
restore_list (&e->in_reply_to, d, off);
restore_list (&e->references, d, off);
restore_list (&e->in_reply_to, d, off);
@@
-427,36
+441,41
@@
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
+
+#ifdef USE_NNTP
+ crc =
+ crc32 (crc, (unsigned char const *) "USE_NNTP", safe_strlen ("USE_NNTP"));
#endif
return crc;
}
#endif
return crc;
}
@@
-495,7
+514,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,
@@
-644,7
+663,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);
@@
-674,7
+693,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);
@@
-701,7
+720,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);