mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 08:40:07 +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.
194 lines
4.6 KiB
C
194 lines
4.6 KiB
C
/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 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 <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
|
|
#include "loadinfo.h"
|
|
|
|
/* On some strange systems still no definition of NULL is found. Sigh! */
|
|
#ifndef NULL
|
|
# if defined __STDC__ && __STDC__
|
|
# define NULL ((void *) 0)
|
|
# else
|
|
# define NULL 0
|
|
# endif
|
|
#endif
|
|
|
|
/* @@ end of prolog @@ */
|
|
|
|
char *
|
|
_nl_find_language (name)
|
|
const char *name;
|
|
{
|
|
while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
|
|
&& name[0] != '+' && name[0] != ',')
|
|
++name;
|
|
|
|
return (char *) name;
|
|
}
|
|
|
|
|
|
int
|
|
_nl_explode_name (name, language, modifier, territory, codeset,
|
|
normalized_codeset, special, sponsor, revision)
|
|
char *name;
|
|
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;
|
|
{
|
|
enum { undecided, xpg, cen } syntax;
|
|
char *cp;
|
|
int mask;
|
|
|
|
*modifier = NULL;
|
|
*territory = NULL;
|
|
*codeset = NULL;
|
|
*normalized_codeset = NULL;
|
|
*special = NULL;
|
|
*sponsor = NULL;
|
|
*revision = NULL;
|
|
|
|
/* 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 = 0;
|
|
syntax = undecided;
|
|
*language = cp = name;
|
|
cp = _nl_find_language (*language);
|
|
|
|
if (*language == cp)
|
|
/* This does not make sense: language has to be specified. Use
|
|
this entry as it is without exploding. Perhaps it is an alias. */
|
|
cp = strchr (*language, '\0');
|
|
else if (cp[0] == '_')
|
|
{
|
|
/* Next is the territory. */
|
|
cp[0] = '\0';
|
|
*territory = ++cp;
|
|
|
|
while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
|
|
&& cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
|
|
++cp;
|
|
|
|
mask |= TERRITORY;
|
|
|
|
if (cp[0] == '.')
|
|
{
|
|
/* Next is the codeset. */
|
|
syntax = xpg;
|
|
cp[0] = '\0';
|
|
*codeset = ++cp;
|
|
|
|
while (cp[0] != '\0' && cp[0] != '@')
|
|
++cp;
|
|
|
|
mask |= XPG_CODESET;
|
|
|
|
if (*codeset != cp && (*codeset)[0] != '\0')
|
|
{
|
|
*normalized_codeset = _nl_normalize_codeset (*codeset,
|
|
cp - *codeset);
|
|
if (strcmp (*codeset, *normalized_codeset) == 0)
|
|
free ((char *) *normalized_codeset);
|
|
else
|
|
mask |= XPG_NORM_CODESET;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
|
|
{
|
|
/* Next is the modifier. */
|
|
syntax = cp[0] == '@' ? xpg : cen;
|
|
cp[0] = '\0';
|
|
*modifier = ++cp;
|
|
|
|
while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
|
|
&& cp[0] != ',' && cp[0] != '_')
|
|
++cp;
|
|
|
|
mask |= XPG_MODIFIER | CEN_AUDIENCE;
|
|
}
|
|
|
|
if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
|
|
{
|
|
syntax = cen;
|
|
|
|
if (cp[0] == '+')
|
|
{
|
|
/* Next is special application (CEN syntax). */
|
|
cp[0] = '\0';
|
|
*special = ++cp;
|
|
|
|
while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
|
|
++cp;
|
|
|
|
mask |= CEN_SPECIAL;
|
|
}
|
|
|
|
if (cp[0] == ',')
|
|
{
|
|
/* Next is sponsor (CEN syntax). */
|
|
cp[0] = '\0';
|
|
*sponsor = ++cp;
|
|
|
|
while (cp[0] != '\0' && cp[0] != '_')
|
|
++cp;
|
|
|
|
mask |= CEN_SPONSOR;
|
|
}
|
|
|
|
if (cp[0] == '_')
|
|
{
|
|
/* Next is revision (CEN syntax). */
|
|
cp[0] = '\0';
|
|
*revision = ++cp;
|
|
|
|
mask |= CEN_REVISION;
|
|
}
|
|
}
|
|
|
|
/* For CEN syntax values it might be important to have the
|
|
separator character in the file name, not for XPG syntax. */
|
|
if (syntax == xpg)
|
|
{
|
|
if (*territory != NULL && (*territory)[0] == '\0')
|
|
mask &= ~TERRITORY;
|
|
|
|
if (*codeset != NULL && (*codeset)[0] == '\0')
|
|
mask &= ~XPG_CODESET;
|
|
|
|
if (*modifier != NULL && (*modifier)[0] == '\0')
|
|
mask &= ~XPG_MODIFIER;
|
|
}
|
|
|
|
return mask;
|
|
}
|