-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
2000-04-26 Ulrich Drepper <drepper@redhat.com> * 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 <jakub@redhat.com> * 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 <haible@clisp.cons.org>
- Loading branch information
Ulrich Drepper
committed
Apr 27, 2000
1 parent
cd201e3
commit 316518d
Showing
6 changed files
with
197 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| #! /bin/sh | ||
| # Testing the implementation of the mb*towc*() and wc*tomb*() functions. | ||
| # Copyright (C) 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 | ||
| # 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. | ||
|
|
||
| common_objpfx=$1; shift | ||
|
|
||
| generate_locale () | ||
| { | ||
| charmap=$1 | ||
| input=$2 | ||
| out=$3 | ||
| rep=$4 | ||
| I18NPATH=. \ | ||
| ${common_objpfx}elf/ld.so --library-path $common_objpfx \ | ||
| ${common_objpfx}locale/localedef --quiet -c -f $charmap -i $input \ | ||
| --repertoire-map $rep ${common_objpfx}localedata/$out | ||
|
|
||
| if [ $? -ne 0 ]; then | ||
| echo "Charmap: \"${charmap}\" Inputfile: \"${input}\"" \ | ||
| "Outputdir: \"${out}\" failed" | ||
| exit 1 | ||
| fi | ||
| } | ||
|
|
||
| generate_locale UTF8 de_DE de_DE.UTF-8 mnemonic.ds | ||
|
|
||
| status=0 | ||
|
|
||
| # Run the test programs. | ||
| LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \ | ||
| ${common_objpfx}elf/ld.so --library-path $common_objpfx \ | ||
| ${common_objpfx}localedata/tst-mbswcs1 \ | ||
| > ${common_objpfx}localedata/tst-mbswcs.out || status=1 | ||
|
|
||
| exit $status |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 <haible@ilog.fr>. | ||
| 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 <stdio.h> | ||
| #include <string.h> | ||
| #include <wchar.h> | ||
| #include <locale.h> | ||
|
|
||
| #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; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters