mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 09:01:07 +00:00
6d24885784
This patch merges the latest release of gettext into the intl subdirectory. The initial motivation was to include the plural.y changes which enable building with bison 3.0, but the majority of the other changes are merely cosmetic so it seemed like merging the whole directory was simpler than trying to take it piecemeal. The merge was done by copying across the latext gettext code and adding in a few small glibc changes that have been added over the years that seemed beneficial, as well as a couple of small build fixes that should be merged back to gettext. I also reverted the gettext commit: commit 279b57fc367251666f00e8e2b599b83703451afb Author: Bruno Haible <bruno@clisp.org> Date: Fri Jun 14 12:03:49 2002 +0000 Make absolute pathnames inside $LANGUAGE work. As it caused localedata/tst-setlocale3 to fail and it wasn't clear that glibc wanted that behaviour. The merge has dropped many uses of __glibc_likely/unlikely. This is intentional given that it eases merging. It seems to me that the cost of continually rewriting these lines when merging and the risk of adding bugs when doing so outweighs the benefits of using these macros when code is shared with another project. Tested with make check on x86_64. ChangeLog: 2014-12-11 Will Newton <will.newton@linaro.org> Merge gettext 0.19.3 into intl/. This involves a number of cosmetic changes to comments and ANSI function definitions and prototypes throughout all the files. The gettext copyright header is used but with the date ranges taken from the glibc copy. * NEWS: Add gettext merge to 2.21. * intl/bindtextdom.c: Switch to gettext copyright. Use ANSI definitions and prototypes. Use gl_* locking primitives rather than __libc_* ones. Use __builtin_expect rather than __glibc_likely/unlikely. * intl/dcgettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/dcigettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. (INTDIV0_RAISES_SIGFPE): New define. Use gl_* locking primitives rather than __libc_* ones. Include eval-plural.h instead of plural-eval.c. Use __builtin_expect rather than __glibc_likely/unlikely. * intl/dcngettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/dgettext.c: Likewise. * intl/dngettext.c: Likewise. * intl/plural-eval.c: Renamed to... * intl/eval-plural.h: ...this. * intl/explodename.c: Switch to gettext copyright. Use ANSI definitions and prototypes. (_nl_explode_name): Use strchr instead of __rawmemchr. * intl/finddomain.c: Switch to gettext copyright. Use ANSI definitions and prototypes. Use gl_* locking primitives rather than __libc_* ones. (_nl_find_domain): Use malloc rather than alloca for allocation of temporary locale name. * intl/gettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/gettextP.h: Switch to gettext copyright. Use ANSI definitions and prototypes. Use gl_* locking primitives rather than __libc_* ones. * intl/gmo.h: Switch to gettext copyright. (struct sysdep_string): Move struct segment_pair outside of struct definition. * intl/hash-string.c: Use ANSI definitions and prototypes. * intl/hash-string.h: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/l10nflist.c: Switch to gettext copyright. Use ANSI definitions and prototypes. (_nl_normalize_codeset): Avoid integer overflow. * intl/loadinfo.h: Switch to gettext copyright. Use ANSI definitions and prototypes. (LIBINTL_DLL_EXPORTED): New define. (PATH_SEPARATOR): New define. * intl/loadmsgcat.c: Switch to gettext copyright. * intl/localealias.c: Switch to gettext copyright. Use ANSI definitions and prototypes. (_nl_expand_alias): Use PATH_SEPARATOR. * intl/ngettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/plural-exp.c: Likewise. * intl/plural-exp.h: Switch to gettext copyright. Use ANSI definitions and prototypes. (struct expression): Move definition of enum operator outside of struct definition. * intl/plural.c: Regenerate. * intl/plural.y: Switch to gettext copyright. Use ANSI definitions and prototypes. Port to bison 3.0. * intl/textdomain.c: Switch to gettext copyright. Use ANSI definitions and prototypes. Use gl_* locking primitives rather than __libc_* ones.
438 lines
10 KiB
C
438 lines
10 KiB
C
/* Handle aliases for locale names.
|
|
Copyright (C) 1995-2014 Free Software Foundation, Inc.
|
|
|
|
This program 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.
|
|
|
|
This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
/* Tell glibc's <string.h> to provide a prototype for mempcpy().
|
|
This must come before <config.h> because <config.h> may include
|
|
<features.h>, and once <features.h> has been included, it's too late. */
|
|
#ifndef _GNU_SOURCE
|
|
# define _GNU_SOURCE 1
|
|
#endif
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <ctype.h>
|
|
#include <stdio.h>
|
|
#if defined _LIBC || defined HAVE___FSETLOCKING
|
|
# include <stdio_ext.h>
|
|
#endif
|
|
#include <sys/types.h>
|
|
|
|
#ifdef __GNUC__
|
|
# undef alloca
|
|
# define alloca __builtin_alloca
|
|
# define HAVE_ALLOCA 1
|
|
#else
|
|
# ifdef _MSC_VER
|
|
# include <malloc.h>
|
|
# define alloca _alloca
|
|
# else
|
|
# if defined HAVE_ALLOCA_H || defined _LIBC
|
|
# include <alloca.h>
|
|
# else
|
|
# ifdef _AIX
|
|
#pragma alloca
|
|
# else
|
|
# ifndef alloca
|
|
char *alloca ();
|
|
# endif
|
|
# endif
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "gettextP.h"
|
|
|
|
#ifdef ENABLE_RELOCATABLE
|
|
# include "relocatable.h"
|
|
#else
|
|
# define relocate(pathname) (pathname)
|
|
#endif
|
|
|
|
/* @@ end of prolog @@ */
|
|
|
|
#ifdef _LIBC
|
|
/* Rename the non ANSI C functions. This is required by the standard
|
|
because some ANSI C functions will require linking with this object
|
|
file and the name space must not be polluted. */
|
|
# define strcasecmp(s1, s2) __strcasecmp_l (s1, s2, _nl_C_locobj_ptr)
|
|
|
|
# ifndef mempcpy
|
|
# define mempcpy __mempcpy
|
|
# endif
|
|
# define HAVE_MEMPCPY 1
|
|
# define HAVE___FSETLOCKING 1
|
|
#endif
|
|
|
|
/* Handle multi-threaded applications. */
|
|
#ifdef _LIBC
|
|
# include <bits/libc-lock.h>
|
|
#else
|
|
# include "lock.h"
|
|
#endif
|
|
|
|
#ifndef internal_function
|
|
# define internal_function
|
|
#endif
|
|
|
|
/* Some optimizations for glibc. */
|
|
#ifdef _LIBC
|
|
# define FEOF(fp) feof_unlocked (fp)
|
|
# define FGETS(buf, n, fp) __fgets_unlocked (buf, n, fp)
|
|
#else
|
|
# define FEOF(fp) feof (fp)
|
|
# define FGETS(buf, n, fp) fgets (buf, n, fp)
|
|
#endif
|
|
|
|
/* For those losing systems which don't have `alloca' we have to add
|
|
some additional code emulating it. */
|
|
#ifdef HAVE_ALLOCA
|
|
# define freea(p) /* nothing */
|
|
#else
|
|
# define alloca(n) malloc (n)
|
|
# define freea(p) free (p)
|
|
#endif
|
|
|
|
#if defined _LIBC_REENTRANT || defined HAVE_DECL_FGETS_UNLOCKED
|
|
# undef fgets
|
|
# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
|
|
#endif
|
|
#if defined _LIBC_REENTRANT || defined HAVE_DECL_FEOF_UNLOCKED
|
|
# undef feof
|
|
# define feof(s) feof_unlocked (s)
|
|
#endif
|
|
|
|
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
|
|
struct alias_map
|
|
{
|
|
const char *alias;
|
|
const char *value;
|
|
};
|
|
|
|
|
|
#ifndef _LIBC
|
|
# define libc_freeres_ptr(decl) decl
|
|
#endif
|
|
|
|
libc_freeres_ptr (static char *string_space);
|
|
static size_t string_space_act;
|
|
static size_t string_space_max;
|
|
libc_freeres_ptr (static struct alias_map *map);
|
|
static size_t nmap;
|
|
static size_t maxmap;
|
|
|
|
|
|
/* Prototypes for local functions. */
|
|
static size_t read_alias_file (const char *fname, int fname_len)
|
|
internal_function;
|
|
static int extend_alias_table (void);
|
|
static int alias_compare (const struct alias_map *map1,
|
|
const struct alias_map *map2);
|
|
|
|
|
|
const char *
|
|
_nl_expand_alias (const char *name)
|
|
{
|
|
static const char *locale_alias_path;
|
|
struct alias_map *retval;
|
|
const char *result = NULL;
|
|
size_t added;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
if (locale_alias_path == NULL)
|
|
locale_alias_path = LOCALE_ALIAS_PATH;
|
|
|
|
do
|
|
{
|
|
struct alias_map item;
|
|
|
|
item.alias = name;
|
|
|
|
if (nmap > 0)
|
|
retval = (struct alias_map *) bsearch (&item, map, nmap,
|
|
sizeof (struct alias_map),
|
|
(int (*) (const void *,
|
|
const void *)
|
|
) alias_compare);
|
|
else
|
|
retval = NULL;
|
|
|
|
/* We really found an alias. Return the value. */
|
|
if (retval != NULL)
|
|
{
|
|
result = retval->value;
|
|
break;
|
|
}
|
|
|
|
/* Perhaps we can find another alias file. */
|
|
added = 0;
|
|
while (added == 0 && locale_alias_path[0] != '\0')
|
|
{
|
|
const char *start;
|
|
|
|
while (locale_alias_path[0] == PATH_SEPARATOR)
|
|
++locale_alias_path;
|
|
start = locale_alias_path;
|
|
|
|
while (locale_alias_path[0] != '\0'
|
|
&& locale_alias_path[0] != PATH_SEPARATOR)
|
|
++locale_alias_path;
|
|
|
|
if (start < locale_alias_path)
|
|
added = read_alias_file (start, locale_alias_path - start);
|
|
}
|
|
}
|
|
while (added != 0);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static size_t
|
|
internal_function
|
|
read_alias_file (const char *fname, int fname_len)
|
|
{
|
|
FILE *fp;
|
|
char *full_fname;
|
|
size_t added;
|
|
static const char aliasfile[] = "/locale.alias";
|
|
|
|
full_fname = (char *) alloca (fname_len + sizeof aliasfile);
|
|
#ifdef HAVE_MEMPCPY
|
|
mempcpy (mempcpy (full_fname, fname, fname_len),
|
|
aliasfile, sizeof aliasfile);
|
|
#else
|
|
memcpy (full_fname, fname, fname_len);
|
|
memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
|
|
#endif
|
|
|
|
#ifdef _LIBC
|
|
/* Note the file is opened with cancellation in the I/O functions
|
|
disabled. */
|
|
fp = fopen (relocate (full_fname), "rce");
|
|
#else
|
|
fp = fopen (relocate (full_fname), "r");
|
|
#endif
|
|
freea (full_fname);
|
|
if (fp == NULL)
|
|
return 0;
|
|
|
|
#ifdef HAVE___FSETLOCKING
|
|
/* No threads present. */
|
|
__fsetlocking (fp, FSETLOCKING_BYCALLER);
|
|
#endif
|
|
|
|
added = 0;
|
|
while (!FEOF (fp))
|
|
{
|
|
/* It is a reasonable approach to use a fix buffer here because
|
|
a) we are only interested in the first two fields
|
|
b) these fields must be usable as file names and so must not
|
|
be that long
|
|
We avoid a multi-kilobyte buffer here since this would use up
|
|
stack space which we might not have if the program ran out of
|
|
memory. */
|
|
char buf[400];
|
|
char *alias;
|
|
char *value;
|
|
char *cp;
|
|
int complete_line;
|
|
|
|
if (FGETS (buf, sizeof buf, fp) == NULL)
|
|
/* EOF reached. */
|
|
break;
|
|
|
|
/* Determine whether the line is complete. */
|
|
complete_line = strchr (buf, '\n') != NULL;
|
|
|
|
cp = buf;
|
|
/* Ignore leading white space. */
|
|
while (isspace ((unsigned char) cp[0]))
|
|
++cp;
|
|
|
|
/* A leading '#' signals a comment line. */
|
|
if (cp[0] != '\0' && cp[0] != '#')
|
|
{
|
|
alias = cp++;
|
|
while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
|
|
++cp;
|
|
/* Terminate alias name. */
|
|
if (cp[0] != '\0')
|
|
*cp++ = '\0';
|
|
|
|
/* Now look for the beginning of the value. */
|
|
while (isspace ((unsigned char) cp[0]))
|
|
++cp;
|
|
|
|
if (cp[0] != '\0')
|
|
{
|
|
value = cp++;
|
|
while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
|
|
++cp;
|
|
/* Terminate value. */
|
|
if (cp[0] == '\n')
|
|
{
|
|
/* This has to be done to make the following test
|
|
for the end of line possible. We are looking for
|
|
the terminating '\n' which do not overwrite here. */
|
|
*cp++ = '\0';
|
|
*cp = '\n';
|
|
}
|
|
else if (cp[0] != '\0')
|
|
*cp++ = '\0';
|
|
|
|
#ifdef IN_LIBGLOCALE
|
|
/* glibc's locale.alias contains entries for ja_JP and ko_KR
|
|
that make it impossible to use a Japanese or Korean UTF-8
|
|
locale under the name "ja_JP" or "ko_KR". Ignore these
|
|
entries. */
|
|
if (strchr (alias, '_') == NULL)
|
|
#endif
|
|
{
|
|
size_t alias_len;
|
|
size_t value_len;
|
|
|
|
if (nmap >= maxmap)
|
|
if (__builtin_expect (extend_alias_table (), 0))
|
|
goto out;
|
|
|
|
alias_len = strlen (alias) + 1;
|
|
value_len = strlen (value) + 1;
|
|
|
|
if (string_space_act + alias_len + value_len > string_space_max)
|
|
{
|
|
/* Increase size of memory pool. */
|
|
size_t new_size = (string_space_max
|
|
+ (alias_len + value_len > 1024
|
|
? alias_len + value_len : 1024));
|
|
char *new_pool = (char *) realloc (string_space, new_size);
|
|
if (new_pool == NULL)
|
|
goto out;
|
|
|
|
if (__builtin_expect (string_space != new_pool, 0))
|
|
{
|
|
size_t i;
|
|
|
|
for (i = 0; i < nmap; i++)
|
|
{
|
|
map[i].alias += new_pool - string_space;
|
|
map[i].value += new_pool - string_space;
|
|
}
|
|
}
|
|
|
|
string_space = new_pool;
|
|
string_space_max = new_size;
|
|
}
|
|
|
|
map[nmap].alias =
|
|
(const char *) memcpy (&string_space[string_space_act],
|
|
alias, alias_len);
|
|
string_space_act += alias_len;
|
|
|
|
map[nmap].value =
|
|
(const char *) memcpy (&string_space[string_space_act],
|
|
value, value_len);
|
|
string_space_act += value_len;
|
|
|
|
++nmap;
|
|
++added;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Possibly not the whole line fits into the buffer. Ignore
|
|
the rest of the line. */
|
|
if (! complete_line)
|
|
do
|
|
if (FGETS (buf, sizeof buf, fp) == NULL)
|
|
/* Make sure the inner loop will be left. The outer loop
|
|
will exit at the `feof' test. */
|
|
break;
|
|
while (strchr (buf, '\n') == NULL);
|
|
}
|
|
|
|
out:
|
|
/* Should we test for ferror()? I think we have to silently ignore
|
|
errors. --drepper */
|
|
fclose (fp);
|
|
|
|
if (added > 0)
|
|
qsort (map, nmap, sizeof (struct alias_map),
|
|
(int (*) (const void *, const void *)) alias_compare);
|
|
|
|
return added;
|
|
}
|
|
|
|
|
|
static int
|
|
extend_alias_table (void)
|
|
{
|
|
size_t new_size;
|
|
struct alias_map *new_map;
|
|
|
|
new_size = maxmap == 0 ? 100 : 2 * maxmap;
|
|
new_map = (struct alias_map *) realloc (map, (new_size
|
|
* sizeof (struct alias_map)));
|
|
if (new_map == NULL)
|
|
/* Simply don't extend: we don't have any more core. */
|
|
return -1;
|
|
|
|
map = new_map;
|
|
maxmap = new_size;
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
alias_compare (const struct alias_map *map1, const struct alias_map *map2)
|
|
{
|
|
#if defined _LIBC || defined HAVE_STRCASECMP
|
|
return strcasecmp (map1->alias, map2->alias);
|
|
#else
|
|
const unsigned char *p1 = (const unsigned char *) map1->alias;
|
|
const unsigned char *p2 = (const unsigned char *) map2->alias;
|
|
unsigned char c1, c2;
|
|
|
|
if (p1 == p2)
|
|
return 0;
|
|
|
|
do
|
|
{
|
|
/* I know this seems to be odd but the tolower() function in
|
|
some systems libc cannot handle nonalpha characters. */
|
|
c1 = isupper (*p1) ? tolower (*p1) : *p1;
|
|
c2 = isupper (*p2) ? tolower (*p2) : *p2;
|
|
if (c1 == '\0')
|
|
break;
|
|
++p1;
|
|
++p2;
|
|
}
|
|
while (c1 == c2);
|
|
|
|
return c1 - c2;
|
|
#endif
|
|
}
|