diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | wcsmbs/Depend | 1 | ||||
| -rw-r--r-- | wcsmbs/Makefile | 6 | ||||
| -rw-r--r-- | wcsmbs/tst-btowc.c | 175 |
4 files changed, 185 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index f2d246b65f..f567b13bbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2000-09-06 Ulrich Drepper <drepper@redhat.com> + * wcsmbs/Depend: New file. + * wcsmbs/Makefile (tests): Add tst-btowc. + (tst-btowc-ENV): Define. + * wcsmbs/tst-btowc.c: New file. + * sysdeps/unix/sysv/linux/_G_config.h: Moved to... * sysdeps/gnu/_G_config.h: ...here to be shared with Hurd. diff --git a/wcsmbs/Depend b/wcsmbs/Depend new file mode 100644 index 0000000000..f3e1156a4e --- /dev/null +++ b/wcsmbs/Depend @@ -0,0 +1 @@ +localedata diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 7ca2800c05..42a1fa133c 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +# Copyright (C) 1995,1996,1997,1998,1999,2000 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 @@ -39,7 +39,7 @@ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ wcscasecmp wcsncase wcscasecmp_l wcsncase_l \ wcsmbsload -tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen +tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc include ../Rules @@ -60,3 +60,5 @@ CFLAGS-wcstoull_l.c = -I../stdlib CFLAGS-wcstod_l.c = -I../stdlib CFLAGS-wcstold_l.c = -I../stdlib CFLAGS-wcstof_l.c = -I../stdlib + +tst-btowc-ENV = LOCPATH=$(common-objpfx)localedata diff --git a/wcsmbs/tst-btowc.c b/wcsmbs/tst-btowc.c new file mode 100644 index 0000000000..58455b3b73 --- /dev/null +++ b/wcsmbs/tst-btowc.c @@ -0,0 +1,175 @@ +/* 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 <wchar.h> + + +/* Currently selected locale. */ +static const char *current_locale; + + +/* Test which should succeed. */ +static int +ok_test (int c, wint_t expwc) +{ + wint_t wc = btowc (c); + + if (wc != expwc) + { + printf ("%s: btowc('%c') failed, returned L'\\x%x' instead of L'\\x%x'\n", + current_locale, c, wc, expwc); + return 1; + } + + return 0; +} + +/* Test which should fail. */ +static int +fail_test (int c) +{ + wint_t wc = btowc (c); + + if (wc != WEOF) + { + printf ("%s: btowc('%c') succeded, returned L'\\x%x' instead of WEOF\n", + current_locale, c, wc); + return 1; + } + + return 0; +} + + +/* Test EOF handling. */ +static int +eof_test (void) +{ + wint_t wc = btowc (EOF); + if (wc != WEOF) + { + printf ("%s: btowc(EOF) returned L'\\x%x', not WEOF\n", + current_locale, wc); + } + + return 0; +} + + +/* Test the btowc() function for a few locales with known character sets. */ +int +main (void) +{ + int result = 0; + + current_locale = setlocale (LC_ALL, "en_US.ANSI_X3.4-1968"); + if (current_locale == NULL) + { + puts ("cannot set locale \"en_US.ANSI_X3.4-1968\""); + result = 1; + } + else + { + int c; + + for (c = 0; c < 128; ++c) + result |= ok_test (c, c); + + for (c = 128; c < 256; ++c) + result |= fail_test (c); + + result |= eof_test (); + } + + current_locale = setlocale (LC_ALL, "de_DE.ISO-8859-1"); + if (current_locale == NULL) + { + puts ("cannot set locale \"de_DE.ISO-8859-1\""); + result = 1; + } + else + { + int c; + + for (c = 0; c < 256; ++c) + result |= ok_test (c, c); + + result |= eof_test (); + } + + current_locale = setlocale (LC_ALL, "de_DE.UTF-8"); + if (current_locale == NULL) + { + puts ("cannot set locale \"de_DE.UTF-8\""); + result = 1; + } + else + { + int c; + + for (c = 0; c < 128; ++c) + result |= ok_test (c, c); + + for (c = 128; c < 256; ++c) + result |= fail_test (c); + + result |= eof_test (); + } + + current_locale = setlocale (LC_ALL, "hr_HR.ISO-8859-2"); + if (current_locale == NULL) + { + puts ("cannot set locale \"hr_HR.ISO-8859-2\""); + result = 1; + } + else + { + static const wint_t upper_half[] = + { + 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, 0x00A8, + 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, 0x00B0, + 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7, 0x00B8, + 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C, 0x0154, + 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7, 0x010C, + 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, 0x0110, + 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, 0x0158, + 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, 0x0155, + 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, 0x010D, + 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, 0x0111, + 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, 0x0159, + 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9 + }; + int c; + + for (c = 0; c < 161; ++c) + result |= ok_test (c, c); + + for (c = 161; c < 256; ++c) + result |= ok_test (c, upper_half[c - 161]); + + result |= eof_test (); + } + + if (result == 0) + puts ("all OK"); + + return result; +} |