mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 05:50:14 +00:00
0555fccea7
2001-03-04 Bruno Haible <bruno@clisp.org> * intl/dcigettext.c (DCIGETTEXT): Increment path_max proportionally. 2001-10-31 Bruno Haible <bruno@clisp.org> * intl/plural.y: Include <stddef.h>, needed for NULL with SunOS 4 cc. 2001-03-21 Bruno Haible <bruno@clisp.org> * intl/dcigettext.c (_nl_state_lock): Mark as #ifdef _LIBC. AIX 3 xlc chokes on empty macro arguments. * intl/plural.y: Add #pragma for alloca on AIX 3. 2001-11-27 Ulrich Drepper <drepper@redhat.com> * intl/dcigettext.c (guess_category_value): Only implement for glibc. Otherwise rely on function _nl_locale_name which isn't present in the glibc sources. 2001-09-24 Bruno Haible <bruno@clisp.org> * intl/loadmsgcat.c (_nl_init_domain_conv): Also enable transliteration when building on a glibc system but outside glibc. 2001-09-22 Bruno Haible <bruno@clisp.org> * intl/plural-eval.c: New file, extracted from dcigettext.c. * intl/dcigettext.c (plural_eval): Remove function, moved to intl/plural-eval.c. (plural_lookup): Call PLURAL_EVAL instead of plural_eval. Include plural-eval.c. 2001-09-22 Bruno Haible <bruno@clisp.org> * intl/plural-exp.c (EXTRACT_PLURAL_EXPRESSION): Reject numbers that don't start with a digit; nplurals must be positive. 2001-09-02 Bruno Haible <bruno@clisp.org> * intl/plural-exp.h: New file, extracted from gettextP.h. * intl/plural-exp.c: New file, extracted from loadmsgcat.c. * intl/gettextP.h (struct expression, struct parse_args, __gettext_free_exp, __gettextparse): Move to plural-exp.h. * intl/loadmsgcat.c: Include plural-exp.h. (PLURAL_PARSE): Move macro to plural-exp.h. (plvar, plone, germanic_plural, INIT_GERMANIC_PLURAL): Move to plural-exp.c. (_nl_load_domain): Move plural handling code to plural-exp.c. Call EXTRACT_PLURAL_EXPRESSION. (_nl_unload_domain): Update. * intl/dcigettext.c: Include plural-exp.h. * intl/plural.y: Include plural-exp.h, not gettextP.h. (FREE_EXPRESSION): Move macro to plural-exp.h. * intl/Makefile (routines): Add plural-exp. (distribute): Add plural-exp.h. 2001-07-28 Bruno Haible <bruno@clisp.org> * intl/l10nflist.c (_nl_normalize_codeset): Cast isalnum, isalpha, isdigit, tolower argument to 'unsigned char'. * intl/loadmsgcat.c (_nl_load_domain): Cast isspace argument to 'unsigned char'. * intl/localealias.c (read_alias_file): Cast isspace argument to 'unsigned char'. 2001-10-20 Bruno Haible <bruno@clisp.org> Assume strchr() exists. (Without it, intl/explodename.c wouldn't link anyway.) * intl/dcigettext.c (strchr): Remove fallback definition; it conflicts with the variable 'index' in plural_lookup. * intl/l10nflist.c (strchr): Likewise. * intl/localealias.c (strchr): Likewise. Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist. * intl/bindtextdom.c: Likewise. * intl/dcigettext.c: Likewise. * intl/dgettext.c: Likewise. * intl/dngettext.c: Likewise. * intl/explodename.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettext.c: Likewise. * intl/l10nflist.c: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/ngettext.c: Likewise. * intl/textdomain.c: Likewise. * intl/gettext.h: Assume <limits.h> exists.
200 lines
5.7 KiB
C
200 lines
5.7 KiB
C
/* Handle list of needed message catalogs
|
|
Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Ulrich Drepper <drepper@gnu.org>, 1995.
|
|
|
|
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. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#if defined HAVE_UNISTD_H || defined _LIBC
|
|
# include <unistd.h>
|
|
#endif
|
|
|
|
#include "gettextP.h"
|
|
#ifdef _LIBC
|
|
# include <libintl.h>
|
|
#else
|
|
# include "libgnuintl.h"
|
|
#endif
|
|
|
|
/* @@ end of prolog @@ */
|
|
/* List of already loaded domains. */
|
|
static struct loaded_l10nfile *_nl_loaded_domains;
|
|
|
|
|
|
/* Return a data structure describing the message catalog described by
|
|
the DOMAINNAME and CATEGORY parameters with respect to the currently
|
|
established bindings. */
|
|
struct loaded_l10nfile *
|
|
internal_function
|
|
_nl_find_domain (dirname, locale, domainname, domainbinding)
|
|
const char *dirname;
|
|
char *locale;
|
|
const char *domainname;
|
|
struct binding *domainbinding;
|
|
{
|
|
struct loaded_l10nfile *retval;
|
|
const char *language;
|
|
const char *modifier;
|
|
const char *territory;
|
|
const char *codeset;
|
|
const char *normalized_codeset;
|
|
const char *special;
|
|
const char *sponsor;
|
|
const char *revision;
|
|
const char *alias_value;
|
|
int mask;
|
|
|
|
/* LOCALE can consist of up to four recognized parts for the XPG syntax:
|
|
|
|
language[_territory[.codeset]][@modifier]
|
|
|
|
and six parts for the CEN syntax:
|
|
|
|
language[_territory][+audience][+special][,[sponsor][_revision]]
|
|
|
|
Beside the first part all of them are allowed to be missing. If
|
|
the full specified locale is not found, the less specific one are
|
|
looked for. The various parts will be stripped off according to
|
|
the following order:
|
|
(1) revision
|
|
(2) sponsor
|
|
(3) special
|
|
(4) codeset
|
|
(5) normalized codeset
|
|
(6) territory
|
|
(7) audience/modifier
|
|
*/
|
|
|
|
/* If we have already tested for this locale entry there has to
|
|
be one data set in the list of loaded domains. */
|
|
retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
|
|
strlen (dirname) + 1, 0, locale, NULL, NULL,
|
|
NULL, NULL, NULL, NULL, NULL, domainname, 0);
|
|
if (retval != NULL)
|
|
{
|
|
/* We know something about this locale. */
|
|
int cnt;
|
|
|
|
if (retval->decided == 0)
|
|
_nl_load_domain (retval, domainbinding);
|
|
|
|
if (retval->data != NULL)
|
|
return retval;
|
|
|
|
for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
|
|
{
|
|
if (retval->successor[cnt]->decided == 0)
|
|
_nl_load_domain (retval->successor[cnt], domainbinding);
|
|
|
|
if (retval->successor[cnt]->data != NULL)
|
|
break;
|
|
}
|
|
return cnt >= 0 ? retval : NULL;
|
|
/* NOTREACHED */
|
|
}
|
|
|
|
/* See whether the locale value is an alias. If yes its value
|
|
*overwrites* the alias name. No test for the original value is
|
|
done. */
|
|
alias_value = _nl_expand_alias (locale);
|
|
if (alias_value != NULL)
|
|
{
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
|
locale = strdup (alias_value);
|
|
if (locale == NULL)
|
|
return NULL;
|
|
#else
|
|
size_t len = strlen (alias_value) + 1;
|
|
locale = (char *) malloc (len);
|
|
if (locale == NULL)
|
|
return NULL;
|
|
|
|
memcpy (locale, alias_value, len);
|
|
#endif
|
|
}
|
|
|
|
/* Now we determine the single parts of the locale name. First
|
|
look for the language. Termination symbols are `_' and `@' if
|
|
we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
|
|
mask = _nl_explode_name (locale, &language, &modifier, &territory,
|
|
&codeset, &normalized_codeset, &special,
|
|
&sponsor, &revision);
|
|
|
|
/* Create all possible locale entries which might be interested in
|
|
generalization. */
|
|
retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
|
|
strlen (dirname) + 1, mask, language, territory,
|
|
codeset, normalized_codeset, modifier, special,
|
|
sponsor, revision, domainname, 1);
|
|
if (retval == NULL)
|
|
/* This means we are out of core. */
|
|
return NULL;
|
|
|
|
if (retval->decided == 0)
|
|
_nl_load_domain (retval, domainbinding);
|
|
if (retval->data == NULL)
|
|
{
|
|
int cnt;
|
|
for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
|
|
{
|
|
if (retval->successor[cnt]->decided == 0)
|
|
_nl_load_domain (retval->successor[cnt], domainbinding);
|
|
if (retval->successor[cnt]->data != NULL)
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* The room for an alias was dynamically allocated. Free it now. */
|
|
if (alias_value != NULL)
|
|
free (locale);
|
|
|
|
/* The space for normalized_codeset is dynamically allocated. Free it. */
|
|
if (mask & XPG_NORM_CODESET)
|
|
free ((void *) normalized_codeset);
|
|
|
|
return retval;
|
|
}
|
|
|
|
|
|
#ifdef _LIBC
|
|
static void __attribute__ ((unused))
|
|
free_mem (void)
|
|
{
|
|
struct loaded_l10nfile *runp = _nl_loaded_domains;
|
|
|
|
while (runp != NULL)
|
|
{
|
|
struct loaded_l10nfile *here = runp;
|
|
if (runp->data != NULL)
|
|
_nl_unload_domain ((struct loaded_domain *) runp->data);
|
|
runp = runp->next;
|
|
free ((char *) here->filename);
|
|
free (here);
|
|
}
|
|
}
|
|
|
|
text_set_element (__libc_subfreeres, free_mem);
|
|
#endif
|