projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops, small regresion
[apps/madmutt.git]
/
muttlib.c
diff --git
a/muttlib.c
b/muttlib.c
index
65007ae
..
1f8ab30
100644
(file)
--- a/
muttlib.c
+++ b/
muttlib.c
@@
-198,7
+198,7
@@
void mutt_pretty_mailbox (char *s)
/* if s is an url, only collapse path component */
if (scheme != U_UNKNOWN) {
p = strchr (s, ':') + 1;
/* if s is an url, only collapse path component */
if (scheme != U_UNKNOWN) {
p = strchr (s, ':') + 1;
- if (!strncmp (p, "//", 2))
+ if (!
m_
strncmp (p, "//", 2))
q = strchr (p + 2, '/');
if (!q)
q = strchr (p, '\0');
q = strchr (p + 2, '/');
if (!q)
q = strchr (p, '\0');
@@
-335,8
+335,8
@@
void mutt_FormatString (char *dest, /* output buffer */
unsigned long data, /* callback data */
format_flag flags)
{ /* callback flags */
unsigned long data, /* callback data */
format_flag flags)
{ /* callback flags */
- char prefix[S
HORT_S
TRING], buf[LONG_STRING], *cp, *wptr = dest, ch;
- char ifstring[S
HORT_STRING], elsestring[SHORT_
STRING];
+ char prefix[STRING], buf[LONG_STRING], *cp, *wptr = dest, ch;
+ char ifstring[S
TRING], elsestring[
STRING];
ssize_t wlen, wid, count, col, len;
prefix[0] = '\0';
ssize_t wlen, wid, count, col, len;
prefix[0] = '\0';
@@
-846,7
+846,7
@@
int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
tok->dsize = expnlen + m_strlen(tok->dptr) + 1;
ptr = xmalloc(tok->dsize);
memcpy(ptr, expn.data, expnlen);
tok->dsize = expnlen + m_strlen(tok->dptr) + 1;
ptr = xmalloc(tok->dsize);
memcpy(ptr, expn.data, expnlen);
- strcpy(ptr + expnlen, tok->dptr); /* __STRCPY_CHECKED__ */
+ m_strcpy(ptr + expnlen, tok->dsize - expnlen, tok->dptr);
if (tok->destroy)
p_delete(&tok->data);
tok->data = ptr;
if (tok->destroy)
p_delete(&tok->data);
tok->data = ptr;