aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-03-19 21:40:15 +0000
committerUlrich Drepper <drepper@redhat.com>2001-03-19 21:40:15 +0000
commit3c504879d9411bb9c57cc69774e1bc0c15a3ea7f (patch)
treee5f1b30ca00287e815d2fb16d5cc38124b3f8c88
parentb28dcd8e13e40f1f894a2057466fc7867d07c76c (diff)
downloadglibc-3c504879d9411bb9c57cc69774e1bc0c15a3ea7f.tar
glibc-3c504879d9411bb9c57cc69774e1bc0c15a3ea7f.tar.gz
glibc-3c504879d9411bb9c57cc69774e1bc0c15a3ea7f.tar.bz2
glibc-3c504879d9411bb9c57cc69774e1bc0c15a3ea7f.zip
Update.
2001-03-19 Ulrich Drepper <drepper@redhat.com> * string/Makefile (tests): Add tst-strxfrm. * string/tst-strxfrm.c: New file. Based on a test case by Paul Eggert. * string/Depend: New file. 2001-03-19 Paul Eggert <eggert@twinsun.com> * string/strxfrm.c (strxfrm): strxfrm should return 0, not 1, when given the empty string in nontrivial locales.
-rw-r--r--ChangeLog11
-rw-r--r--string/Depend1
-rw-r--r--string/Makefile2
-rw-r--r--string/strxfrm.c2
-rw-r--r--string/tst-strxfrm.c56
5 files changed, 70 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c82d4abc7..935e710689 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-03-19 Ulrich Drepper <drepper@redhat.com>
+
+ * string/Makefile (tests): Add tst-strxfrm.
+ * string/tst-strxfrm.c: New file. Based on a test case by Paul Eggert.
+ * string/Depend: New file.
+
+2001-03-19 Paul Eggert <eggert@twinsun.com>
+
+ * string/strxfrm.c (strxfrm): strxfrm should return 0, not 1,
+ when given the empty string in nontrivial locales.
+
2001-03-17 H.J. Lu <hjl@gnu.org>
* manual/Makefile (install): Use $(INSTALL_DATA) instead of
diff --git a/string/Depend b/string/Depend
new file mode 100644
index 0000000000..f3e1156a4e
--- /dev/null
+++ b/string/Depend
@@ -0,0 +1 @@
+localedata
diff --git a/string/Makefile b/string/Makefile
index 9c91a668dd..ff86bbb788 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -48,7 +48,7 @@ o-objects.ob := memcpy.o memset.o memchr.o
tests := tester inl-tester noinl-tester testcopy test-ffs \
tst-strlen stratcliff tst-svc tst-inlcall \
bug-strncat1 bug-strspn1 bug-strpbrk1 tst-bswap \
- tst-strtok
+ tst-strtok tst-strxfrm
distribute := memcopy.h pagecopy.h tst-svc.expect
diff --git a/string/strxfrm.c b/string/strxfrm.c
index 38be80bea7..9c9165708b 100644
--- a/string/strxfrm.c
+++ b/string/strxfrm.c
@@ -162,7 +162,7 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l)
{
if (n != 0)
*dest = L('\0');
- return 1;
+ return 0;
}
/* We need the elements of the string as unsigned values since they
diff --git a/string/tst-strxfrm.c b/string/tst-strxfrm.c
new file mode 100644
index 0000000000..94fd67e062
--- /dev/null
+++ b/string/tst-strxfrm.c
@@ -0,0 +1,56 @@
+/* Based on a test case by Paul Eggert. */
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+char const string[] = "";
+
+
+static int
+test (const char *locale)
+{
+ size_t bufsize;
+ size_t r;
+ size_t l;
+ char *buf;
+ int result = 0;
+
+ if (setlocale (LC_COLLATE, locale) == NULL)
+ {
+ printf ("cannot set locale \"%s\"\n", locale);
+ return 1;
+ }
+ bufsize = strxfrm (NULL, string, 0) + 1;
+ buf = malloc (bufsize);
+ if (buf == NULL)
+ {
+ printf ("cannot allocate %zd bytes\n", bufsize);
+ return 1;
+ }
+ r = strxfrm (buf, string, bufsize);
+ l = strlen (buf);
+ if (r != l)
+ {
+ printf ("locale \"%s\": strxfrm returned %zu, strlen returned %zu\n",
+ locale, r, l);
+ result = 1;
+ }
+ free (buf);
+
+ return result;
+}
+
+
+int
+main (void)
+{
+ int result = 0;
+
+ result |= test ("C");
+ result |= test ("en_US.ISO-8859-1");
+ result |= test ("de_DE.UTF-8");
+
+ return result;
+}