mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
4a4d50f372
2001-03-17 Bruno Haible <haible@clisp.cons.org> * intl/loadmsgcat.c (_nl_load_domain) [!_LIBC]: Use fstat, not fstat64. 2001-03-17 Bruno Haible <haible@clisp.cons.org> * intl/gettextP.h (struct expression): Add operators lnot, less_than, greater_than, less_or_equal, greater_or_equal. Replace args2/args3 union by a 'nargs' counter and an 'args[]' array. * intl/plural.y: Don't include stdarg.h. (new_exp): Take an array of arguments instead of varargs. (new_exp_0, new_exp_1, new_exp_2, new_exp_3): New functions. ('?' ':'): Make right-associative. (EQUOP2): New token, replaces '=' and '!'. (CMPOP2): New token. (ADDOP2): New token, replaces '+' and '-'. (MULOP2): New token, replaces '*', '/' and '%'. ('!'): New token. (exp): Add rules for CMPOP2 and '!'. Don't call YYABORT. (start): Call YYABORT here. (FREE_EXPRESSION): Update. (yylex): Don't skip "\\n". Recognize comparison and '!' operators. Update for new token symbols. * intl/loadmsgcat.c (plvar, plone, germanic_plural, init_germanic_plural): Update. * intl/dcigettext.c (_nl_find_msg): Optimize for space. (plural_eval): Recognize comparison and '!' operators. Optimize for space. 2001-03-10 Bruno Haible <haible@clisp.cons.org> * intl/loadmsgcat.c (_nl_load_domain): locale_charset() doesn't return NULL any more. 2001-01-05 Bruno Haible <haible@clisp.cons.org> * intl/loadmsgcat.c: Include headers needed for alloca(). (freea): New macro. (_nl_load_domain): Add fallback code for platforms lacking alloca. * intl/localealias.c: (ADD_BLOCK, FREE_BLOCK): Remove macros. (freea): New macro. (read_alias_file): Simplify fallback code for platforms lacking alloca. 2001-01-07 Bruno Haible <haible@clisp.cons.org> * intl/gettextP.h (__gettextdebug): Remove declaration. (__gettext_free_exp, __gettextparse): Convert prototype to K&R C syntax. (gettext_free_exp__, gettextparse__): New non-libc declarations. * intl/plural.y [!_LIBC]: Define gettextparse__, gettext_free_exp__, not __gettextparse, __gettext_free_exp. * intl/loadmsgcat.c [!_LIBC]: Use gettextparse__, not __gettextparse. 2001-02-24 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c: Update comment about HAVE_LOCALE_NULL. 2001-01-05 Bruno Haible <haible@clisp.cons.org> * intl/loadmsgcat.c (_nl_load_domain): Add fallback code for platforms lacking strtoul, like SunOS4. 2001-01-05 Bruno Haible <haible@clisp.cons.org> * intl/l10nflist.c (_nl_normalize_codeset): Use tolower, not _tolower. 2001-01-05 Bruno Haible <haible@clisp.cons.org> * intl/bindtextdom.c (set_binding_values): Convert prototype to K&R C syntax. * intl/dcigettext.c (transcmp): Convert to K&R C syntax. * intl/explodename.c (_nl_find_language): Convert to K&R C syntax. * intl/plural.y (__gettext_free_exp, yylex, yyerror): Convert to K&R C syntax. 2001-01-07 Bruno Haible <haible@clisp.cons.org> * intl/gettextP.h (gettext__, dgettext__, dcgettext__, textdomain__, bindtextdomain__, bind_textdomain_codeset__): New declarations, from old libgettext.h. * intl/bindtextdom.c: Include libgnuintl.h instead of libgettext.h. * intl/dcgettext.c: Likewise. * intl/dcigettext.c: Likewise. * intl/dcngettext.c: Likewise. * intl/dngettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/ngettext.c: Likewise. * intl/textdomain.c: Likewise. * intl/dgettext.c: Include libgnuintl.h instead of libgettext.h. Include gettextP.h. * intl/gettext.c: Likewise. Don't include locale.h. 2001-03-17 Bruno Haible <haible@clisp.cons.org> * intl/gettextP.h (ZERO): New macro. (struct binding): Always use ZERO. * intl/bindtextdom.c (offsetof): Provide fallback for platforms that lack it, like SunOS4. (set_binding_values): Use offsetof, not sizeof. * intl/dcigettext.c (offsetof): Provide fallback for platforms that lack it, like SunOS4. (ZERO): Remove macro. (struct transmem_list): Use ZERO. (DCIGETTEXT): Use offsetof, not sizeof. 2001-03-17 Bruno Haible <haible@clisp.cons.org> * intl/gettextP.h: Include <stddef.h>. Include gettext.h, for nls_uint32. * intl/bindtextdom.c: Don't include gettext.h. * intl/dcgettext.c: Likewise. * intl/dcigettext.c: Likewise. * intl/dcngettext.c: Likewise. * intl/dngettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/localealias.c: Likewise. * intl/ngettext.c: Likewise. * intl/plural.y: Likewise. * intl/textdomain.c: Likewise. 2001-03-17 Bruno Haible <haible@clisp.cons.org> * intl/gettext.h: Don't include <stdio.h>. 2001-03-17 Bruno Haible <haible@clisp.cons.org> * intl/Makefile (CPPFLAGS): Set LOCALEDIR instead of GNULOCALEDIR. * intl/dcigettext.c (_nl_default_dirname): Initialize with LOCALEDIR.
420 lines
9.6 KiB
C
420 lines
9.6 KiB
C
/* Handle aliases for locale names.
|
|
Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
|
|
|
|
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. */
|
|
|
|
/* 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>
|
|
#include <sys/types.h>
|
|
|
|
#ifdef __GNUC__
|
|
# define alloca __builtin_alloca
|
|
# define HAVE_ALLOCA 1
|
|
#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
|
|
|
|
#if defined STDC_HEADERS || defined _LIBC
|
|
# include <stdlib.h>
|
|
#else
|
|
char *getenv ();
|
|
# ifdef HAVE_MALLOC_H
|
|
# include <malloc.h>
|
|
# else
|
|
void free ();
|
|
# endif
|
|
#endif
|
|
|
|
#if defined HAVE_STRING_H || defined _LIBC
|
|
# include <string.h>
|
|
#else
|
|
# include <strings.h>
|
|
# ifndef memcpy
|
|
# define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
|
|
# endif
|
|
#endif
|
|
#if !HAVE_STRCHR && !defined _LIBC
|
|
# ifndef strchr
|
|
# define strchr index
|
|
# endif
|
|
#endif
|
|
|
|
#include "gettextP.h"
|
|
|
|
/* @@ 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 __strcasecmp
|
|
|
|
# ifndef mempcpy
|
|
# define mempcpy __mempcpy
|
|
# endif
|
|
# define HAVE_MEMPCPY 1
|
|
|
|
/* We need locking here since we can be called from different places. */
|
|
# include <bits/libc-lock.h>
|
|
|
|
__libc_lock_define_initialized (static, lock);
|
|
#endif
|
|
|
|
#ifndef internal_function
|
|
# define internal_function
|
|
#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_FGETS_UNLOCKED
|
|
# undef fgets
|
|
# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
|
|
#endif
|
|
#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED
|
|
# undef feof
|
|
# define feof(s) feof_unlocked (s)
|
|
#endif
|
|
|
|
|
|
struct alias_map
|
|
{
|
|
const char *alias;
|
|
const char *value;
|
|
};
|
|
|
|
|
|
static char *string_space;
|
|
static size_t string_space_act;
|
|
static size_t string_space_max;
|
|
static struct alias_map *map;
|
|
static size_t nmap;
|
|
static size_t maxmap;
|
|
|
|
|
|
/* Prototypes for local functions. */
|
|
static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
|
|
internal_function;
|
|
static int extend_alias_table PARAMS ((void));
|
|
static int alias_compare PARAMS ((const struct alias_map *map1,
|
|
const struct alias_map *map2));
|
|
|
|
|
|
const char *
|
|
_nl_expand_alias (name)
|
|
const char *name;
|
|
{
|
|
static const char *locale_alias_path = LOCALE_ALIAS_PATH;
|
|
struct alias_map *retval;
|
|
const char *result = NULL;
|
|
size_t added;
|
|
|
|
#ifdef _LIBC
|
|
__libc_lock_lock (lock);
|
|
#endif
|
|
|
|
do
|
|
{
|
|
struct alias_map item;
|
|
|
|
item.alias = name;
|
|
|
|
if (nmap > 0)
|
|
retval = (struct alias_map *) bsearch (&item, map, nmap,
|
|
sizeof (struct alias_map),
|
|
(int (*) PARAMS ((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] == ':')
|
|
++locale_alias_path;
|
|
start = locale_alias_path;
|
|
|
|
while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
|
|
++locale_alias_path;
|
|
|
|
if (start < locale_alias_path)
|
|
added = read_alias_file (start, locale_alias_path - start);
|
|
}
|
|
}
|
|
while (added != 0);
|
|
|
|
#ifdef _LIBC
|
|
__libc_lock_unlock (lock);
|
|
#endif
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static size_t
|
|
internal_function
|
|
read_alias_file (fname, fname_len)
|
|
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
|
|
|
|
fp = fopen (full_fname, "r");
|
|
freea (full_fname);
|
|
if (fp == NULL)
|
|
return 0;
|
|
|
|
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
|
|
*/
|
|
char buf[BUFSIZ];
|
|
char *alias;
|
|
char *value;
|
|
char *cp;
|
|
|
|
if (fgets (buf, sizeof buf, fp) == NULL)
|
|
/* EOF reached. */
|
|
break;
|
|
|
|
/* Possibly not the whole line fits into the buffer. Ignore
|
|
the rest of the line. */
|
|
if (strchr (buf, '\n') == NULL)
|
|
{
|
|
char altbuf[BUFSIZ];
|
|
do
|
|
if (fgets (altbuf, sizeof altbuf, fp) == NULL)
|
|
/* Make sure the inner loop will be left. The outer loop
|
|
will exit at the `feof' test. */
|
|
break;
|
|
while (strchr (altbuf, '\n') == NULL);
|
|
}
|
|
|
|
cp = buf;
|
|
/* Ignore leading white space. */
|
|
while (isspace (cp[0]))
|
|
++cp;
|
|
|
|
/* A leading '#' signals a comment line. */
|
|
if (cp[0] != '\0' && cp[0] != '#')
|
|
{
|
|
alias = cp++;
|
|
while (cp[0] != '\0' && !isspace (cp[0]))
|
|
++cp;
|
|
/* Terminate alias name. */
|
|
if (cp[0] != '\0')
|
|
*cp++ = '\0';
|
|
|
|
/* Now look for the beginning of the value. */
|
|
while (isspace (cp[0]))
|
|
++cp;
|
|
|
|
if (cp[0] != '\0')
|
|
{
|
|
size_t alias_len;
|
|
size_t value_len;
|
|
|
|
value = cp++;
|
|
while (cp[0] != '\0' && !isspace (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';
|
|
|
|
if (nmap >= maxmap)
|
|
if (__builtin_expect (extend_alias_table (), 0))
|
|
return added;
|
|
|
|
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)
|
|
return added;
|
|
|
|
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 = memcpy (&string_space[string_space_act],
|
|
alias, alias_len);
|
|
string_space_act += alias_len;
|
|
|
|
map[nmap].value = memcpy (&string_space[string_space_act],
|
|
value, value_len);
|
|
string_space_act += value_len;
|
|
|
|
++nmap;
|
|
++added;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* 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 (*) PARAMS ((const void *, const void *))) alias_compare);
|
|
|
|
return added;
|
|
}
|
|
|
|
|
|
static int
|
|
extend_alias_table ()
|
|
{
|
|
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;
|
|
}
|
|
|
|
|
|
#ifdef _LIBC
|
|
static void __attribute__ ((unused))
|
|
free_mem (void)
|
|
{
|
|
if (string_space != NULL)
|
|
free (string_space);
|
|
if (map != NULL)
|
|
free (map);
|
|
}
|
|
text_set_element (__libc_subfreeres, free_mem);
|
|
#endif
|
|
|
|
|
|
static int
|
|
alias_compare (map1, map2)
|
|
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
|
|
}
|