mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 23:30:07 +00:00
45eca4d141
2000-05-06 Bruno Haible <haible@clisp.cons.org> * iconv/gconv_open.c (__gconv_open): If __gconv_find_transform returned != __GCONV_OK, there is nothing to clean up. 2000-05-06 Bruno Haible <haible@clisp.cons.org> * intl/tst-gettext.c (main): Disable possibly existing LC_CTYPE and OUTPUT_CHARSET environment variables. 2000-05-06 Andreas Jaeger <aj@suse.de> * sysdeps/generic/dl-cache.h (struct file_entry_new): New. (struct cache_file_new): New. (struct file_entry): New (moved from cache.c). (struct cache_file): New (moved from cache.c). * sysdeps/generic/dl-cache.c (SEARCH_CACHE): New macro, broken out from _dl_load_cache_lookup. (_dl_load_cache_lookup): Move search to SEARCH_CACHE macro, handle the different cache formats. New variable cache_new for new format. * elf/ldconfig.h: Change according to changes in cache.c and ldconfig.c; remove cache_libcmp; add opt_format. * elf/ldconfig.c: Include "dl-cache.h" and "dl-procinfo.h"; remove stuff that's defined in those headers. Add hwcap to struct lib_entry. (opt_format): New variable to select cache format. (options): Add format parameter. (is_hwcap): New function. (path_hwcap): New function. (parse_opt): Handle new format parameter. (search_dir): Handle hwcap, search also subdirectories with hwcap. * elf/cache.c (_GNU_SOURCE): Removed. Not needed anymore since ldconfig is part of glibc. Include dl-cache.h and remove stuff that's defined there. (struct cache_entry): Add new member hwcap. (print_entry): Print hwcap, cleanup a bit. (print_cache): Print new and old formats. (compare): Use _dl_cache_libcmp from dl-cache.h; handle hwcap. (save_cache): Save new and old formats. (add_to_cache): Handle hwcap. * sysdeps/generic/dl-cache.c (_dl_cache_libcmp): Moved from here... * sysdeps/generic/dl-cache.h (_dl_cache_libcmp): ...to here. * sysdeps/generic/dl-cache.c (LD_SO_CACHE): Moved from here... * sysdeps/generic/dl-cache.h (LD_SO_CACHE): ...to here. * sysdeps/generic/dl-cache.c (CACHEMAGIC): Moved from here... * sysdeps/generic/dl-cache.h (CACHEMAGIC): ...to here. 2000-05-05 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (alignof): New macro. (_nl_find_msg): Use it instead of __alignof__. Pass correct output buffer length to __gconv/iconv. If malloc (freemem_size) fails, set freemem_size to 0. 2000-05-05 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (dcigettext): Fix interpretation of tsearch return value.
325 lines
8.6 KiB
C
325 lines
8.6 KiB
C
/* Test of the gettext functions.
|
|
Copyright (C) 2000 Free Software Foundation, Inc.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.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 <libintl.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
|
|
const struct
|
|
{
|
|
const char *msgid;
|
|
const char *msgstr;
|
|
} msgs[] =
|
|
{
|
|
#define INPUT(Str) { Str,
|
|
#define OUTPUT(Str) Str },
|
|
#include TESTSTRS_H
|
|
};
|
|
|
|
const char *catname[] =
|
|
{
|
|
[LC_MESSAGES] = "LC_MESSAGES",
|
|
[LC_TIME] = "LC_TIME",
|
|
[LC_NUMERIC] = "LC_NUMERIC"
|
|
};
|
|
|
|
|
|
static int positive_gettext_test (void);
|
|
static int negative_gettext_test (void);
|
|
static int positive_dgettext_test (const char *domain);
|
|
static int positive_dcgettext_test (const char *domain, int category);
|
|
static int negative_dcgettext_test (const char *domain, int category);
|
|
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
int result = 0;
|
|
|
|
/* This is the place where the .mo files are placed. */
|
|
if (argc > 1)
|
|
{
|
|
bindtextdomain ("existing-domain", argv[1]);
|
|
bindtextdomain ("existing-time-domain", argv[1]);
|
|
bindtextdomain ("non-existing-domain", argv[1]);
|
|
}
|
|
|
|
/* The locale the catalog is created for is "existing-category". Now
|
|
set the various variables in question to this value and run the
|
|
test. */
|
|
setenv ("LANGUAGE", "existing-locale", 1);
|
|
setenv ("LC_ALL", "non-existing-locale", 1);
|
|
setenv ("LC_MESSAGES", "non-existing-locale", 1);
|
|
setenv ("LC_CTYPE", "non-existing-locale", 1);
|
|
setenv ("LANG", "non-existing-locale", 1);
|
|
unsetenv ("OUTPUT_CHARSET");
|
|
/* This is the name of the existing domain with a catalog for the
|
|
LC_MESSAGES category. */
|
|
textdomain ("existing-domain");
|
|
puts ("test `gettext' with LANGUAGE set");
|
|
if (positive_gettext_test () != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
/* This is the name of a non-existing domain with a catalog for the
|
|
LC_MESSAGES category. We leave this value set for the `dgettext'
|
|
and `dcgettext' tests. */
|
|
textdomain ("non-existing-domain");
|
|
puts ("test `gettext' with LANGUAGE set");
|
|
if (negative_gettext_test () != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
puts ("test `dgettext' with LANGUAGE set");
|
|
if (positive_dgettext_test ("existing-domain") != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
|
|
/* Now the same tests with LC_ALL deciding. */
|
|
unsetenv ("LANGUAGE");
|
|
setenv ("LC_ALL", "existing-locale", 1);
|
|
puts ("test `gettext' with LC_ALL set");
|
|
/* This is the name of the existing domain with a catalog for the
|
|
LC_MESSAGES category. */
|
|
textdomain ("existing-domain");
|
|
if (positive_gettext_test () != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
/* This is the name of a non-existing domain with a catalog for the
|
|
LC_MESSAGES category. We leave this value set for the `dgettext'
|
|
and `dcgettext' tests. */
|
|
textdomain ("non-existing-domain");
|
|
puts ("test `gettext' with LANGUAGE set");
|
|
if (negative_gettext_test () != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
puts ("test `dgettext' with LANGUAGE set");
|
|
if (positive_dgettext_test ("existing-domain") != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
|
|
/* Now the same tests with LC_MESSAGES deciding. */
|
|
unsetenv ("LC_ALL");
|
|
setenv ("LC_MESSAGES", "existing-locale", 1);
|
|
setenv ("LC_TIME", "existing-locale", 1);
|
|
setenv ("LC_NUMERIC", "non-existing-locale", 1);
|
|
puts ("test `gettext' with LC_ALL set");
|
|
/* This is the name of the existing domain with a catalog for the
|
|
LC_MESSAGES category. */
|
|
textdomain ("existing-domain");
|
|
if (positive_gettext_test () != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
/* This is the name of a non-existing domain with a catalog for the
|
|
LC_MESSAGES category. We leave this value set for the `dgettext'
|
|
and `dcgettext' tests. */
|
|
textdomain ("non-existing-domain");
|
|
puts ("test `gettext' with LANGUAGE set");
|
|
if (negative_gettext_test () != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
puts ("test `dgettext' with LANGUAGE set");
|
|
if (positive_dgettext_test ("existing-domain") != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
puts ("test `dcgettext' with LANGUAGE set (LC_MESSAGES)");
|
|
if (positive_dcgettext_test ("existing-domain", LC_MESSAGES) != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
/* Try a different category. For this we also switch the domain. */
|
|
puts ("test `dcgettext' with LANGUAGE set (LC_TIME)");
|
|
if (positive_dcgettext_test ("existing-time-domain", LC_TIME) != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
/* This time use a category for which there is no catalog. */
|
|
puts ("test `dcgettext' with LANGUAGE set (LC_NUMERIC)");
|
|
if (negative_dcgettext_test ("existing-domain", LC_NUMERIC) != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
|
|
/* Now the same tests with LANG deciding. */
|
|
unsetenv ("LC_MESSAGES");
|
|
setenv ("LANG", "existing-locale", 1);
|
|
/* This is the name of the existing domain with a catalog for the
|
|
LC_MESSAGES category. */
|
|
textdomain ("existing-domain");
|
|
puts ("test `gettext' with LC_ALL set");
|
|
if (positive_gettext_test () != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
/* This is the name of a non-existing domain with a catalog for the
|
|
LC_MESSAGES category. We leave this value set for the `dgettext'
|
|
and `dcgettext' tests. */
|
|
textdomain ("non-existing-domain");
|
|
puts ("test `gettext' with LANGUAGE set");
|
|
if (negative_gettext_test () != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
puts ("test `dgettext' with LANGUAGE set");
|
|
if (positive_dgettext_test ("existing-domain") != 0)
|
|
{
|
|
puts ("FAILED");
|
|
result = 1;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
positive_gettext_test (void)
|
|
{
|
|
size_t cnt;
|
|
int result = 0;
|
|
|
|
for (cnt = 0; cnt < sizeof (msgs) / sizeof (msgs[0]); ++cnt)
|
|
{
|
|
const char *found = gettext (msgs[cnt].msgid);
|
|
|
|
if (found == NULL || strcmp (found, msgs[cnt].msgstr) != 0)
|
|
{
|
|
/* Oops, shouldn't happen. */
|
|
printf (" gettext (\"%s\") failed, returned \"%s\"\n",
|
|
msgs[cnt].msgid, found);
|
|
result = 1;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
negative_gettext_test (void)
|
|
{
|
|
size_t cnt;
|
|
int result = 0;
|
|
|
|
for (cnt = 0; cnt < sizeof (msgs) / sizeof (msgs[0]); ++cnt)
|
|
{
|
|
const char *found = gettext (msgs[cnt].msgid);
|
|
|
|
if (found != msgs[cnt].msgid)
|
|
{
|
|
/* Oops, shouldn't happen. */
|
|
printf (" gettext (\"%s\") failed\n", msgs[cnt].msgid);
|
|
result = 1;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
positive_dgettext_test (const char *domain)
|
|
{
|
|
size_t cnt;
|
|
int result = 0;
|
|
|
|
for (cnt = 0; cnt < sizeof (msgs) / sizeof (msgs[0]); ++cnt)
|
|
{
|
|
const char *found = dgettext (domain, msgs[cnt].msgid);
|
|
|
|
if (found == NULL || strcmp (found, msgs[cnt].msgstr) != 0)
|
|
{
|
|
/* Oops, shouldn't happen. */
|
|
printf (" dgettext (\"%s\", \"%s\") failed, returned \"%s\"\n",
|
|
domain, msgs[cnt].msgid, found);
|
|
result = 1;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
positive_dcgettext_test (const char *domain, int category)
|
|
{
|
|
size_t cnt;
|
|
int result = 0;
|
|
|
|
for (cnt = 0; cnt < sizeof (msgs) / sizeof (msgs[0]); ++cnt)
|
|
{
|
|
const char *found = dcgettext (domain, msgs[cnt].msgid, category);
|
|
|
|
if (found == NULL || strcmp (found, msgs[cnt].msgstr) != 0)
|
|
{
|
|
/* Oops, shouldn't happen. */
|
|
printf (" dcgettext (\"%s\", \"%s\", %s) failed, returned \"%s\"\n",
|
|
domain, msgs[cnt].msgid, catname[category], found);
|
|
result = 1;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
negative_dcgettext_test (const char *domain, int category)
|
|
{
|
|
size_t cnt;
|
|
int result = 0;
|
|
|
|
for (cnt = 0; cnt < sizeof (msgs) / sizeof (msgs[0]); ++cnt)
|
|
{
|
|
const char *found = dcgettext (domain, msgs[cnt].msgid, category);
|
|
|
|
if (found != msgs[cnt].msgid)
|
|
{
|
|
/* Oops, shouldn't happen. */
|
|
printf (" dcgettext (\"%s\", \"%s\", %s) failed\n",
|
|
domain, msgs[cnt].msgid, catname[category]);
|
|
result = 1;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|