aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--string/strxfrm.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b23f60f..7308622 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-01-25 Ulrich Drepper <drepper@cygnus.com>
+
+ * string/strxfrm.c: Don't count in the terminating NUL byte/word.
+
2000-01-24 Paul Eggert <eggert@twinsun.com>
* posix/fnmatch_loop.c (FCT): Use locale's collating sequence when
diff --git a/string/strxfrm.c b/string/strxfrm.c
index 9fd9526..7ddc5f3 100644
--- a/string/strxfrm.c
+++ b/string/strxfrm.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
@@ -478,5 +478,7 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l)
if (use_malloc)
free (idxarr);
- return needed;
+ /* Return the number of bytes/words we need, but don't count the NUL
+ byte/word at the end. */
+ return needed - 1;
}