aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-18 21:08:05 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-18 21:08:05 +0000
commitbb2fc8504d9aaa024bdfd2d630f4241c0e24bbf5 (patch)
tree9bb185e64b7184263be4830747fea4d6bc6d989b /wcsmbs
parent7b32d065d6854e5f40e656bb7a7081430ec80c5f (diff)
downloadglibc-bb2fc8504d9aaa024bdfd2d630f4241c0e24bbf5.zip
glibc-bb2fc8504d9aaa024bdfd2d630f4241c0e24bbf5.tar.gz
glibc-bb2fc8504d9aaa024bdfd2d630f4241c0e24bbf5.tar.bz2
Update.
2000-11-18 Ulrich Drepper <drepper@redhat.com> * wcsmbs/mbrtowc.c (__mbrtowc): Do not only flush if input is '\0'. * wcsmbs/Makefile (tests): Add tst-mbrtowc and tst-wcrtomb. (tst-mbrtowc-ENV): New variable. (tst-wcrtomb-ENV): New variable. * wcsmbs/tst-mbrtowc.c: New file. * wcsmbs/tst-wcrtomb.c: New file.
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/Makefile5
-rw-r--r--wcsmbs/mbrtowc.c4
-rw-r--r--wcsmbs/tst-mbrtowc.c108
-rw-r--r--wcsmbs/tst-wcrtomb.c95
4 files changed, 208 insertions, 4 deletions
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
index 42a1fa1..325b397 100644
--- a/wcsmbs/Makefile
+++ b/wcsmbs/Makefile
@@ -39,7 +39,8 @@ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \
wcscasecmp wcsncase wcscasecmp_l wcsncase_l \
wcsmbsload
-tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc
+tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \
+ tst-wcrtomb
include ../Rules
@@ -62,3 +63,5 @@ CFLAGS-wcstold_l.c = -I../stdlib
CFLAGS-wcstof_l.c = -I../stdlib
tst-btowc-ENV = LOCPATH=$(common-objpfx)localedata
+tst-mbrtowc-ENV = LOCPATH=$(common-objpfx)localedata
+tst-wcrtomb-ENV = LOCPATH=$(common-objpfx)localedata
diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c
index 034ccfe..7c05680 100644
--- a/wcsmbs/mbrtowc.c
+++ b/wcsmbs/mbrtowc.c
@@ -42,7 +42,7 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
size_t dummy;
const unsigned char *inbuf;
char *outbuf = (char *) (pwc ?: buf);
- int flush;
+ int flush = 0;
/* Set information for this step. */
data.__invocation_counter = 0;
@@ -60,8 +60,6 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
n = 1;
flush = 1;
}
- else
- flush = *s == '\0' ? 1 : 0;
/* Tell where we want the result. */
data.__outbuf = outbuf;
diff --git a/wcsmbs/tst-mbrtowc.c b/wcsmbs/tst-mbrtowc.c
new file mode 100644
index 0000000..cbd8796
--- /dev/null
+++ b/wcsmbs/tst-mbrtowc.c
@@ -0,0 +1,108 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+
+static int check_ascii (const char *locname);
+
+
+int
+main (void)
+{
+ int result = 0;
+
+ /* Check mapping of ASCII range for some character sets which have
+ ASCII as a subset. For those the wide char generated must have
+ the same value. */
+ setlocale (LC_ALL, "C");
+ result |= check_ascii (setlocale (LC_ALL, NULL));
+
+ setlocale (LC_ALL, "de_DE.UTF-8");
+ result |= check_ascii (setlocale (LC_ALL, NULL));
+
+ setlocale (LC_ALL, "ja_JP.EUC-JP");
+ result |= check_ascii (setlocale (LC_ALL, NULL));
+
+ return result;
+}
+
+
+static int
+check_ascii (const char *locname)
+{
+ int c;
+ int res = 0;
+
+ printf ("Testing locale \"%s\":\n", locname);
+
+ for (c = 0; c <= 127; ++c)
+ {
+ char buf[MB_CUR_MAX];
+ wchar_t wc = 0xffffffff;
+ mbstate_t s;
+ size_t n;
+ int i;
+
+ for (i = 0; i < MB_CUR_MAX; ++i)
+ buf[i] = c + i;
+
+ memset (&s, '\0', sizeof (s));
+
+ n = mbrtowc (&wc, buf, MB_CUR_MAX, &s);
+ if (n == (size_t) -1)
+ {
+ printf ("%s: '\\x%x': encoding error\n", locname, c);
+ ++res;
+ }
+ else if (n == (size_t) -2)
+ {
+ printf ("%s: '\\x%x': incomplete character\n", locname, c);
+ ++res;
+ }
+ else if (n == 0 && c != 0)
+ {
+ printf ("%s: '\\x%x': 0 returned\n", locname, c);
+ ++res;
+ }
+ else if (n != 0 && c == 0)
+ {
+ printf ("%s: '\\x%x': not 0 returned\n", locname, c);
+ ++res;
+ }
+ else if (c != 0 && n != 1)
+ {
+ printf ("%s: '\\x%x': not 1 returned\n", locname, c);
+ ++res;
+ }
+ else if (wc != (wchar_t) c)
+ {
+ printf ("%s: '\\x%x': wc != L'\\x%x'\n", locname, c, c);
+ ++res;
+ }
+ }
+
+ printf (res == 1 ? "%d error\n" : "%d errors\n", res);
+
+ return res != 0;
+}
diff --git a/wcsmbs/tst-wcrtomb.c b/wcsmbs/tst-wcrtomb.c
new file mode 100644
index 0000000..5b96cf5
--- /dev/null
+++ b/wcsmbs/tst-wcrtomb.c
@@ -0,0 +1,95 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+
+static int check_ascii (const char *locname);
+
+
+int
+main (void)
+{
+ int result = 0;
+
+ /* Check mapping of ASCII range for some character sets which have
+ ASCII as a subset. For those the wide char generated must have
+ the same value. */
+ setlocale (LC_ALL, "C");
+ result |= check_ascii (setlocale (LC_ALL, NULL));
+
+ setlocale (LC_ALL, "de_DE.UTF-8");
+ result |= check_ascii (setlocale (LC_ALL, NULL));
+
+ setlocale (LC_ALL, "ja_JP.EUC-JP");
+ result |= check_ascii (setlocale (LC_ALL, NULL));
+
+ return result;
+}
+
+
+static int
+check_ascii (const char *locname)
+{
+ wchar_t wc;
+ int res = 0;
+
+ printf ("Testing locale \"%s\":\n", locname);
+
+ for (wc = 0; wc <= 127; ++wc)
+ {
+ char buf[2 * MB_CUR_MAX];
+ mbstate_t s;
+ size_t n;
+
+ memset (buf, '\xff', sizeof (buf));
+ memset (&s, '\0', sizeof (s));
+
+ n = wcrtomb (buf, wc, &s);
+ if (n == (size_t) -1)
+ {
+ printf ("%s: '\\x%x': encoding error\n", locname, (int) wc);
+ ++res;
+ }
+ else if (n == 0)
+ {
+ printf ("%s: '\\x%x': 0 returned\n", locname, (int) wc);
+ ++res;
+ }
+ else if (n != 1)
+ {
+ printf ("%s: '\\x%x': not 1 returned\n", locname, (int) wc);
+ ++res;
+ }
+ else if (wc != (wchar_t) buf[0])
+ {
+ printf ("%s: L'\\x%x': buf[0] != '\\x%x'\n", locname, (int) wc,
+ (int) wc);
+ ++res;
+ }
+ }
+
+ printf (res == 1 ? "%d error\n" : "%d errors\n", res);
+
+ return res != 0;
+}