2004-04-23 Artem B. Bityuckiy <abitytsky@softminecorp.com>
* configure.in: Define _MB_CAPABLE if mb supported.
* configure: Regenerated.
* configure.host: Remove manual setting of MB_CAPABLE compiler
flag.
* newlib.hin: Add _MB_CAPABLE flag.
* libc/ctype/iswalpha.c, libc/ctype/iswblank.c: Include <newlib.h>
and check for _MB_CAPABLE flag instead of MB_CAPABLE.
* libc/ctype/iswcntrl.c, libc/ctype/iswprint.c: Ditto.
* libc/ctype/iswpunct.c, libc/ctype/iswspace.c: Ditto.
* libc/ctype/jp2uc.c: Ditto.
* libc/ctype/towlower.c, libc/ctype/towupper.c: Ditto.
* libc/locale/locale.c: Ditto
* libc/machine/powerpc/vfscanf.c: Ditto
* libc/stdio/vfprintf.c, libc/stdio/vfscanf.c: Ditto
* libc/stdlib/mblen.c: Ditto
* libc/stdlib/mblen_r.c, libc/stdlib/mbrlen.c: Ditto
* libc/stdlib/mbrtowc.c, libc/stdlib/mbsrtowcs.c: Ditto
* libc/stdlib/mbstowcs.c, libc/stdlib/mbtowc.c: Ditto
* libc/stdlib/mbtowc_r.c, libc/stdlib/wcrtomb.c: Ditto
* libc/stdlib/wcsrtombs.c, libc/stdlib/wcstombs.c: Ditto
* libc/stdlib/wctomb.c, libc/sys/linux/intl/dcigettext.c: Ditto
* libc/sys/linux/intl/explodename.c: Ditto
* libc/sys/linux/intl/finddomain.c: Ditto
* libc/sys/linux/intl/l10nflist.c: Ditto
* libc/sys/linux/intl/loadmsgcat.c: Ditto
* libc/sys/linux/intl/localealias.c: Ditto
2004-04-24 05:44:22 +08:00
|
|
|
#include <newlib.h>
|
|
|
|
|
|
|
|
#ifdef _MB_CAPABLE
|
2003-05-29 06:04:40 +08:00
|
|
|
|
|
|
|
/* 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
|
|
|
|
|
|
|
|
#if defined STDC_HEADERS || defined _LIBC
|
|
|
|
# include <stdlib.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined HAVE_STRING_H || defined _LIBC
|
|
|
|
# include <string.h>
|
|
|
|
#else
|
|
|
|
# include <strings.h>
|
|
|
|
#endif
|
|
|
|
#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;
|
|
|
|
}
|
|
|
|
|
2004-04-23 Artem B. Bityuckiy <abitytsky@softminecorp.com>
* configure.in: Define _MB_CAPABLE if mb supported.
* configure: Regenerated.
* configure.host: Remove manual setting of MB_CAPABLE compiler
flag.
* newlib.hin: Add _MB_CAPABLE flag.
* libc/ctype/iswalpha.c, libc/ctype/iswblank.c: Include <newlib.h>
and check for _MB_CAPABLE flag instead of MB_CAPABLE.
* libc/ctype/iswcntrl.c, libc/ctype/iswprint.c: Ditto.
* libc/ctype/iswpunct.c, libc/ctype/iswspace.c: Ditto.
* libc/ctype/jp2uc.c: Ditto.
* libc/ctype/towlower.c, libc/ctype/towupper.c: Ditto.
* libc/locale/locale.c: Ditto
* libc/machine/powerpc/vfscanf.c: Ditto
* libc/stdio/vfprintf.c, libc/stdio/vfscanf.c: Ditto
* libc/stdlib/mblen.c: Ditto
* libc/stdlib/mblen_r.c, libc/stdlib/mbrlen.c: Ditto
* libc/stdlib/mbrtowc.c, libc/stdlib/mbsrtowcs.c: Ditto
* libc/stdlib/mbstowcs.c, libc/stdlib/mbtowc.c: Ditto
* libc/stdlib/mbtowc_r.c, libc/stdlib/wcrtomb.c: Ditto
* libc/stdlib/wcsrtombs.c, libc/stdlib/wcstombs.c: Ditto
* libc/stdlib/wctomb.c, libc/sys/linux/intl/dcigettext.c: Ditto
* libc/sys/linux/intl/explodename.c: Ditto
* libc/sys/linux/intl/finddomain.c: Ditto
* libc/sys/linux/intl/l10nflist.c: Ditto
* libc/sys/linux/intl/loadmsgcat.c: Ditto
* libc/sys/linux/intl/localealias.c: Ditto
2004-04-24 05:44:22 +08:00
|
|
|
#endif /* _MB_CAPABLE */
|