Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix typo in strncat, wcsncat manual entries
* manual/string.texi (Copying and Concatenation): Fix typos in
sample implementations of strncat and wcsncat, by having them use
the old value of the destination length, not the new one.
  • Loading branch information
Paul Eggert committed Dec 4, 2015
1 parent 8f5e8b0 commit 5d1d491
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
@@ -1,3 +1,10 @@
2015-12-04 Paul Eggert <eggert@cs.ucla.edu>

Fix typo in strncat, wcsncat manual entries
* manual/string.texi (Copying and Concatenation): Fix typos in
sample implementations of strncat and wcsncat, by having them use
the old value of the destination length, not the new one.

2015-12-04 Joseph Myers <joseph@codesourcery.com>

[BZ #16961]
Expand Down
10 changes: 6 additions & 4 deletions manual/string.texi
Expand Up @@ -996,8 +996,9 @@ The @code{strncat} function could be implemented like this:
char *
strncat (char *to, const char *from, size_t size)
@{
memcpy (to + strlen (to), from, strnlen (from, size));
to[strlen (to) + strnlen (from, size)] = '\0';
size_t len = strlen (to);
memcpy (to + len, from, strnlen (from, size));
to[len + strnlen (from, size)] = '\0';
return to;
@}
@end group
Expand Down Expand Up @@ -1025,8 +1026,9 @@ wchar_t *
wcsncat (wchar_t *restrict wto, const wchar_t *restrict wfrom,
size_t size)
@{
memcpy (wto + wcslen (wto), wfrom, wcsnlen (wfrom, size) * sizeof (wchar_t));
wto[wcslen (to) + wcsnlen (wfrom, size)] = '\0';
size_t len = wcslen (wto);
memcpy (wto + len, wfrom, wcsnlen (wfrom, size) * sizeof (wchar_t));
wto[len + wcsnlen (wfrom, size)] = L'\0';
return wto;
@}
@end group
Expand Down

0 comments on commit 5d1d491

Please sign in to comment.