summary refs log tree commit diff
path: root/stdlib
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-02-23 23:30:12 +0000
committerUlrich Drepper <drepper@redhat.com>2004-02-23 23:30:12 +0000
commit16edf13b226dbe5f4f39794cfa363904af2c7973 (patch)
treeab38d57dd3ddfeaae672f0253a2bbdfb759ee96f /stdlib
parent5605e1177d4728b66b92cb5012810b5feda1ec4b (diff)
downloadglibc-16edf13b226dbe5f4f39794cfa363904af2c7973.tar.gz
glibc-16edf13b226dbe5f4f39794cfa363904af2c7973.tar.xz
glibc-16edf13b226dbe5f4f39794cfa363904af2c7973.zip
Update.
	* wcsmbs/mbrtowc.c (__mbrtowc): Cap s + n at the end of address space.
	* stdlib/Makefile (tests): Add testmb2.
	(testmb2-ENV): New.
	* stdlib/testmb2.c: New test.

2004-02-23  Jakub Jelinek  <jakub@redhat.com>
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/Makefile5
-rw-r--r--stdlib/testmb2.c31
2 files changed, 34 insertions, 2 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 72633d8290..5f4675033e 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1991-2002, 2003, 2004 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -63,7 +63,7 @@ tests		:= tst-strtol tst-strtod testmb testrand testsort testdiv   \
 		   test-canon test-canon2 tst-strtoll tst-environ	    \
 		   tst-xpg-basename tst-random tst-bsearch tst-limits	    \
 		   tst-rand48 bug-strtod tst-setcontext test-a64l tst-qsort \
-		   tst-system
+		   tst-system testmb2
 
 
 # Several mpn functions from GNU MP are used by the strtod function.
@@ -105,6 +105,7 @@ include ../Rules
 test-canon-ARGS = --test-dir=${common-objpfx}stdlib
 
 tst-strtod-ENV = LOCPATH=$(common-objpfx)localedata
+testmb2-ENV = LOCPATH=$(common-objpfx)localedata
 
 # Run a test on the header files we use.
 tests: $(objpfx)isomac.out
diff --git a/stdlib/testmb2.c b/stdlib/testmb2.c
new file mode 100644
index 0000000000..3a3e354629
--- /dev/null
+++ b/stdlib/testmb2.c
@@ -0,0 +1,31 @@
+/* Test case by Miloslav Trmac <mitr@volny.cz>.  */
+#include <locale.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+int
+main (void)
+{
+  wchar_t wc;
+
+  if (setlocale (LC_CTYPE, "de_DE.UTF-8") == NULL)
+    {
+      puts ("setlocale failed");
+      return 1;
+    }
+
+  if (mbtowc (&wc, "\xc3\xa1", MB_CUR_MAX) != 2 || wc != 0xE1)
+    {
+      puts ("1st mbtowc failed");
+      return 1;
+    }
+
+  if (mbtowc (&wc, "\xc3\xa1", SIZE_MAX) != 2 || wc != 0xE1)
+    {
+      puts ("2nd mbtowc failed");
+      return 1;
+    }
+
+  return 0;
+}