From 316518d610789256841f929e3c5757d1e385fcd5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 27 Apr 2000 05:42:19 +0000 Subject: Update. 2000-04-26 Ulrich Drepper * iconv/gconv_simple.c (utf8_internal_loop): Correctly reconstruct stored character in state in UNPACK_BYTES macro. * iconv/loop.c (SINGLE(LOOPFCT)): Make it actually work. Correct test for available characters, handle result of BODY code correctly. * localedata/Makefile (test-srcs): Add tst-mbswcs1. (distribute): Add tst-mbswcs.sh. Add rule to run tst-mbswcs.sh. * localedata/tst-mbswcs.sh: New file. * localedata/tst-mbswcs1.c: New file. 2000-04-26 Jakub Jelinek * nis/nis_callback.c (__nis_create_callback): Do failed memory allocation fixups centrally, fix __builtin_expect call, return NULL on failure, not NIS_NOMEMORY. 2000-04-27 Bruno Haible --- localedata/tst-mbswcs1.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 localedata/tst-mbswcs1.c (limited to 'localedata/tst-mbswcs1.c') diff --git a/localedata/tst-mbswcs1.c b/localedata/tst-mbswcs1.c new file mode 100644 index 0000000..79745f0 --- /dev/null +++ b/localedata/tst-mbswcs1.c @@ -0,0 +1,63 @@ +/* Test restarting behaviour of mbrtowc. + Copyright (C) 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Bruno Haible . + + 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 +#include +#include +#include + +#define show(expr, nexp, wcexp) \ + n = expr; \ + printf (#expr " -> %Zd", n); \ + printf (", wc = %lu", (unsigned long int) wc); \ + if (n != (size_t) nexp || wc != wcexp) \ + { \ + printf (", expected %Zd and %lu", nexp, (unsigned long int) wcexp); \ + result = 1; \ + } \ + putc ('\n', stdout) + +int +main (void) +{ + unsigned char buf[6] = { 0x25, 0xe2, 0x82, 0xac, 0xce, 0xbb }; + mbstate_t state; + wchar_t wc = 42; + size_t n; + int result = 0; + const char *used_locale; + + setlocale (LC_CTYPE, "de_DE.UTF-8"); + /* Double check. */ + used_locale = setlocale (LC_CTYPE, NULL); + printf ("used locale: \"%s\"\n", used_locale); + result = strcmp (used_locale, "de_DE.UTF-8"); + + memset (&state, '\0', sizeof (state)); + + show (mbrtowc (&wc, buf + 0, 1, &state), 1, 37); + show (mbrtowc (&wc, buf + 1, 1, &state), -2, 37); + show (mbrtowc (&wc, buf + 2, 3, &state), 2, 8364); + show (mbrtowc (&wc, buf + 4, 1, &state), -2, 8364); + show (mbrtowc (&wc, buf + 5, 1, &state), 1, 955); + show (mbrtowc (&wc, buf + 5, 1, &state), -1, 955); + + return result; +} -- cgit v1.1