aboutsummaryrefslogtreecommitdiff
path: root/intl/explodename.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-07-24 10:07:08 +0000
committerUlrich Drepper <drepper@redhat.com>2002-07-24 10:07:08 +0000
commite155c80135043ce7582a5cb8623142c8ca14cbe5 (patch)
tree04dfe662eccf94461c6cdc9f47c89ad2a733fa59 /intl/explodename.c
parent7e93f91553018f1e24c3610da694a51ffb7f7021 (diff)
downloadglibc-e155c80135043ce7582a5cb8623142c8ca14cbe5.zip
glibc-e155c80135043ce7582a5cb8623142c8ca14cbe5.tar.gz
glibc-e155c80135043ce7582a5cb8623142c8ca14cbe5.tar.bz2
Remove support for CEN-style locale variables. It was never used and shouldn't be since it's not portable.
Diffstat (limited to 'intl/explodename.c')
-rw-r--r--intl/explodename.c101
1 files changed, 21 insertions, 80 deletions
diff --git a/intl/explodename.c b/intl/explodename.c
index 0b17776..bfaa5ab 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
@@ -42,8 +42,7 @@ char *
_nl_find_language (name)
const char *name;
{
- while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
- && name[0] != '+' && name[0] != ',')
+ while (name[0] != '\0' && name[0] != '_' && name[0] != '@' && name[0] != '.')
++name;
return (char *) name;
@@ -52,18 +51,14 @@ _nl_find_language (name)
int
_nl_explode_name (name, language, modifier, territory, codeset,
- normalized_codeset, special, sponsor, revision)
+ normalized_codeset)
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;
@@ -71,15 +66,10 @@ _nl_explode_name (name, language, modifier, territory, codeset,
*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. */
+ look for the language. Termination symbols are `_', '.', and `@'. */
mask = 0;
- syntax = undecided;
*language = cp = name;
cp = _nl_find_language (*language);
@@ -87,22 +77,23 @@ _nl_explode_name (name, language, modifier, territory, codeset,
/* 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] == '_')
+ else if (cp[0] != '@')
{
- /* Next is the territory. */
- cp[0] = '\0';
- *territory = ++cp;
+ 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;
+ while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@')
+ ++cp;
- mask |= TERRITORY;
+ mask |= XPG_TERRITORY;
+ }
if (cp[0] == '.')
{
/* Next is the codeset. */
- syntax = xpg;
cp[0] = '\0';
*codeset = ++cp;
@@ -123,71 +114,21 @@ _nl_explode_name (name, language, modifier, territory, codeset,
}
}
- if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
+ if (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 (cp[0] != '\0')
+ mask |= XPG_MODIFIER;
}
- if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
- {
- syntax = cen;
+ if (*territory != NULL && (*territory)[0] == '\0')
+ mask &= ~XPG_TERRITORY;
- 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;
- }
+ if (*codeset != NULL && (*codeset)[0] == '\0')
+ mask &= ~XPG_CODESET;
return mask;
}