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
9541f65
..
f64a601
100644
(file)
--- a/
hcache.c
+++ b/
hcache.c
@@
-125,7
+125,7
@@
static unsigned char *dump_char (char *c, unsigned char *d, int *off)
return d;
}
return d;
}
- size =
safe
_strlen (c) + 1;
+ size =
mutt
_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);
@@
-387,12
+387,15
@@
static unsigned char *dump_envelope (ENVELOPE * e, unsigned char *d, int *off)
d = dump_list (e->in_reply_to, d, off);
d = dump_list (e->userhdrs, d, off);
d = dump_list (e->in_reply_to, d, off);
d = dump_list (e->userhdrs, d, off);
+ d = dump_int (e->irt_changed, d, off);
+ d = dump_int (e->refs_changed, d, off);
+
return d;
}
static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off)
{
return d;
}
static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off)
{
- int
real_subj_off
;
+ int
tmp = 0
;
restore_address (&e->return_path, d, off);
restore_address (&e->from, d, off);
restore_address (&e->return_path, d, off);
restore_address (&e->from, d, off);
@@
-404,9
+407,9
@@
static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off)
restore_address (&e->mail_followup_to, d, off);
restore_char (&e->subject, d, off);
restore_address (&e->mail_followup_to, d, off);
restore_char (&e->subject, d, off);
- restore_int ((unsigned int *) (&
real_subj_off
), d, off);
- if (0 <=
real_subj_off
) {
- e->real_subj = e->subject +
real_subj_off
;
+ restore_int ((unsigned int *) (&
tmp
), d, off);
+ if (0 <=
tmp
) {
+ e->real_subj = e->subject +
tmp
;
}
else {
e->real_subj = NULL;
}
else {
e->real_subj = NULL;
@@
-426,6
+429,11
@@
static void restore_envelope (ENVELOPE * e, const unsigned char *d, int *off)
restore_list (&e->references, d, off);
restore_list (&e->in_reply_to, d, off);
restore_list (&e->userhdrs, d, off);
restore_list (&e->references, d, off);
restore_list (&e->in_reply_to, d, off);
restore_list (&e->userhdrs, d, off);
+
+ restore_int ((unsigned int *) &tmp, d, off);
+ e->irt_changed = tmp;
+ restore_int ((unsigned int *) &tmp, d, off);
+ e->refs_changed = tmp;
}
static
}
static
@@
-447,35
+455,35
@@
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",
-
safe
_strlen
+
mutt
_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,
safe
_strlen (Charset));
+ crc = crc32 (crc, (unsigned char const *) Charset,
mutt
_strlen (Charset));
crc =
crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
crc =
crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
-
safe
_strlen ("HAVE_LANGINFO_CODESET"));
+
mutt
_strlen ("HAVE_LANGINFO_CODESET"));
#endif
#ifdef USE_POP
crc =
#endif
#ifdef USE_POP
crc =
- crc32 (crc, (unsigned char const *) "USE_POP",
safe
_strlen ("USE_POP"));
+ crc32 (crc, (unsigned char const *) "USE_POP",
mutt
_strlen ("USE_POP"));
#endif
#ifdef MIXMASTER
crc =
crc32 (crc, (unsigned char const *) "MIXMASTER",
#endif
#ifdef MIXMASTER
crc =
crc32 (crc, (unsigned char const *) "MIXMASTER",
-
safe
_strlen ("MIXMASTER"));
+
mutt
_strlen ("MIXMASTER"));
#endif
#ifdef USE_IMAP
crc =
#endif
#ifdef USE_IMAP
crc =
- crc32 (crc, (unsigned char const *) "USE_IMAP",
safe
_strlen ("USE_IMAP"));
+ crc32 (crc, (unsigned char const *) "USE_IMAP",
mutt
_strlen ("USE_IMAP"));
#endif
#ifdef USE_NNTP
crc =
#endif
#ifdef USE_NNTP
crc =
- crc32 (crc, (unsigned char const *) "USE_NNTP",
safe
_strlen ("USE_NNTP"));
+ crc32 (crc, (unsigned char const *) "USE_NNTP",
mutt
_strlen ("USE_NNTP"));
#endif
return crc;
}
#endif
return crc;
}
@@
-514,7
+522,7
@@
static const char *mutt_hcache_per_folder (const char *path,
}
MD5Init (&md5);
}
MD5Init (&md5);
- MD5Update (&md5, (unsigned char *) folder,
safe
_strlen (folder));
+ MD5Update (&md5, (unsigned char *) folder,
mutt
_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,
@@
-785,7
+793,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) -
safe
_strlen (path));
+ strncat (path, filename, sizeof (path) -
mutt
_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
key.dptr = path;
key.dsize = keylen (path);
@@
-815,7
+823,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) -
safe
_strlen (path));
+ strncat (path, filename, sizeof (path) -
mutt
_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
key.dptr = path;
key.dsize = keylen (path);
@@
-842,7
+850,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) -
safe
_strlen (path));
+ strncat (path, filename, sizeof (path) -
mutt
_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
key.dptr = path;
key.dsize = keylen (path);