mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-27 04:41:02 +08:00
4e82c61025
* intl/tst-gettext3.sh: New file. * intl/Makefile (distribute): Add tst-gettext3.sh. (test-srcs): Add tst-gettext3. (tests): Depend on tst-gettext3.out. (tst-gettext3.out): New rule. (CFLAGS-tst-gettext3.c): New variable. Fix bug exposed by tst-gettext3. * intl/gettextP.h (struct converted_domain): New type. (struct loaded_domain): Remove the conv, conv_tab fields. Add conversions, nconversions fields. (_nl_init_domain_conv): Remove declaration. (_nl_free_domain_conv): Remove declaration. (_nl_find_msg): Add convert argument. * intl/dcigettext.c (DCIGETTEXT): Call _nl_find_msg with convert=1. (_nl_find_msg): Add convert argument. When a conversion to a different charset is needed, create a new converted_domain element, instead of throwing away the old converted translations. (get_output_charset): New function. * intl/loadmsgcat.c (_nl_init_domain_conv): Remove function. (_nl_free_domain_conv): Remove function. (_nl_load_domain): Initialize the conversions array to empty. Use _nl_find_msg instead of _nl_init_domain_conv to retrieve the header entry. (_nl_unload_domain): Free the conversions array and its contents. * intl/gettextP.h (struct loaded_domain): Remove codeset_cntr field. (struct binding): Likewise. * intl/bindtextdom.c (set_binding_values): Drop codeset_cntr modifications.
61 lines
1.7 KiB
C
61 lines
1.7 KiB
C
/* Test that the gettext() results come out in the correct encoding for
|
|
locales that differ only in their encoding.
|
|
Copyright (C) 2001, 2005 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Bruno Haible <bruno@clisp.org>, 2001, 2005.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <libintl.h>
|
|
#include <locale.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
int
|
|
main (void)
|
|
{
|
|
char *s;
|
|
int result = 0;
|
|
|
|
unsetenv ("LANGUAGE");
|
|
unsetenv ("OUTPUT_CHARSET");
|
|
textdomain ("codeset");
|
|
bindtextdomain ("codeset", OBJPFX "domaindir");
|
|
|
|
setlocale (LC_ALL, "de_DE.ISO-8859-1");
|
|
|
|
/* Here we expect output in ISO-8859-1. */
|
|
s = gettext ("cheese");
|
|
if (strcmp (s, "K\344se"))
|
|
{
|
|
printf ("call 1 returned: %s\n", s);
|
|
result = 1;
|
|
}
|
|
|
|
setlocale (LC_ALL, "de_DE.UTF-8");
|
|
|
|
/* Here we expect output in UTF-8. */
|
|
s = gettext ("cheese");
|
|
if (strcmp (s, "K\303\244se"))
|
|
{
|
|
printf ("call 2 returned: %s\n", s);
|
|
result = 1;
|
|
}
|
|
|
|
return result;
|
|
}
|