mirror of
https://github.com/fluencelabs/musl
synced 2025-06-17 00:41:45 +00:00
fix strncat and wcsncat (double null termination)
also modify wcsncpy to use the same loop logic
This commit is contained in:
@ -4,7 +4,7 @@ char *strncat(char *d, const char *s, size_t n)
|
|||||||
{
|
{
|
||||||
char *a = d;
|
char *a = d;
|
||||||
d += strlen(d);
|
d += strlen(d);
|
||||||
while (n && (*d++ = *s++)) n--;
|
while (n && *s) n--, *d++ = *s++;
|
||||||
*d++ = 0;
|
*d++ = 0;
|
||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ wchar_t *wcsncat(wchar_t *d, const wchar_t *s, size_t n)
|
|||||||
{
|
{
|
||||||
wchar_t *a = d;
|
wchar_t *a = d;
|
||||||
d += wcslen(d);
|
d += wcslen(d);
|
||||||
while (n && (*d++ = *s++)) n--;
|
while (n && *s) n--, *d++ = *s++;
|
||||||
*d++ = 0;
|
*d++ = 0;
|
||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
wchar_t *wcsncpy(wchar_t *d, const wchar_t *s, size_t n)
|
wchar_t *wcsncpy(wchar_t *d, const wchar_t *s, size_t n)
|
||||||
{
|
{
|
||||||
wchar_t *a = d;
|
wchar_t *a = d;
|
||||||
for (; n && (*d = *s); n--, d++, s++);
|
while (n && *s) n--, *d++ = *s++;
|
||||||
wmemset(d, 0, n);
|
wmemset(d, 0, n);
|
||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user