mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-06 05:10:05 +00:00
0f283ffc5e
TLS_INIT_TCB_SIZE, TLS_INIT_TCB_ALIGN instead of 0, 1. * include/getopt.h: Include <features.h> before <posix/getopt.h>. * locale/findlocale.c (_nl_remove_locale): Don't search in _nl_locale_file_list if DATA->alloc is ld_archive. Use _nl_unload_locale to do the rest of the work. * locale/loadarchive.c (_nl_load_locale_from_archive): Set usage_count of new structure to UNDELETABLE. * wctype/wctype.h (iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank, towlower, towupper): Macros removed. * ctype/ctype.h (__tobody): Put parens around macro argument. (__isctype): Macro removed. (__ctype_b, __ctype_tolower, __ctype_toupper): Decls removed. (isalnum, isalpha, iscntrl, isdigit, islower, isgraph, isprint, ispunct, isspace, isupper, isxdigit, isblank, _tolower, _toupper, tolower, toupper): Macros and inlines removed. * include/ctype.h [! NOT_IN_libc] (isalnum, isalpha, iscntrl, isdigit, islower, isgraph, isprint, ispunct, isspace, isupper, isxdigit, isblank, _tolower, _toupper, tolower, toupper): Define here instead, using _NL_CURRENT. * ctype/ctype.c (__ctype_tolower, __ctype_toupper): Define as macros using _NL_CURRENT. * ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Likewise. * ctype/ctype-info.c (__ctype_b, __ctype_tolower, __ctype_toupper): Renamed these to __ctype_old_*. Define old names only for SHLIB_COMPAT. (__ctype32_b, __ctype32_tolower, __ctype32_toupper): Likewise. (__ctype32_wctrans, __ctype32_wctrans, __ctype32_width): Removed. * locale/lc-ctype.c (_nl_postload_ctype): Use renamed variables, conditional on SHLIB_COMPAT. Don't set removed variables at all. * wctype/wcfuncs.c: Use _NL_CURRENT instead of those globals. * wcsmbs/wcwidth.h (internal_wcwidth): Likewise. * resolv/res_init.c [RESOLVSORT] (sort_mask): Renamed sort_mask_chars. (ISSORTMASK): Update use. * intl/localealias.c [__GNUC__]: #undef alloca before #define. * nss/nss_files/files-XXX.c (last_use): Rename `none' to `nouse'. (_nss_files_getENTNAME_r): Likewise. * nss/nss_files/files-alias.c (last_use, _nss_files_getaliasent_r): Likewise. * Makerules (all-nonlib): Renamed from all-tests. Include $(others) here too. * locale/Makefile (CPPFLAGS-locale, CPPFLAGS-localedef, CPPFLAGS-ld-ctype, CPPFLAGS-ld-time, CPPFLAGS-ld-numeric, CPPFLAGS-ld-monetary, CPPFLAGS-ld-collate, CPPFLAGS-ld-identification, CPPFLAGS-charmap, CPPFLAGS-locarchive, CPPFLAGS-linereader, CPPFLAGS-charmap-dir): Variables removed. Instead, catch all the program modules via cppflags-iterator.mk. * sunrpc/Makefile (CPPFLAGS-rpc_main): Variable removed. Instead, catch all rpcgen-objs via cppflags-iterator.mk. * posix/tst-getconf.sh: If no third arg, work with static linking.
293 lines
9.7 KiB
C
293 lines
9.7 KiB
C
/* Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
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. */
|
|
|
|
#include <assert.h>
|
|
#include <locale.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#ifdef _POSIX_MAPPED_FILES
|
|
# include <sys/mman.h>
|
|
#endif
|
|
|
|
#include "localeinfo.h"
|
|
#include "../iconv/gconv_charset.h"
|
|
|
|
|
|
#ifdef NL_CURRENT_INDIRECT
|
|
# define DEFINE_CATEGORY(category, category_name, items, a) \
|
|
extern struct locale_data _nl_C_##category; \
|
|
weak_extern (_nl_C_##category)
|
|
# include "categories.def"
|
|
# undef DEFINE_CATEGORY
|
|
|
|
/* Array indexed by category of pointers to _nl_C_CATEGORY slots.
|
|
Elements are zero for categories whose data is never used. */
|
|
struct locale_data *const _nl_C[] attribute_hidden =
|
|
{
|
|
# define DEFINE_CATEGORY(category, category_name, items, a) \
|
|
[category] = &_nl_C_##category,
|
|
# include "categories.def"
|
|
# undef DEFINE_CATEGORY
|
|
};
|
|
#else
|
|
# define _nl_C (_nl_C_locobj.__locales)
|
|
#endif
|
|
|
|
|
|
/* For each category we keep a list of records for the locale files
|
|
which are somehow addressed. */
|
|
struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST];
|
|
|
|
const char _nl_default_locale_path[] attribute_hidden = LOCALEDIR;
|
|
|
|
|
|
struct locale_data *
|
|
internal_function
|
|
_nl_find_locale (const char *locale_path, size_t locale_path_len,
|
|
int category, const char **name)
|
|
{
|
|
int mask;
|
|
/* Name of the locale for this category. */
|
|
char *loc_name;
|
|
const char *language;
|
|
const char *modifier;
|
|
const char *territory;
|
|
const char *codeset;
|
|
const char *normalized_codeset;
|
|
struct loaded_l10nfile *locale_file;
|
|
|
|
if ((*name)[0] == '\0')
|
|
{
|
|
/* The user decides which locale to use by setting environment
|
|
variables. */
|
|
*name = getenv ("LC_ALL");
|
|
if (*name == NULL || (*name)[0] == '\0')
|
|
*name = getenv (_nl_category_names[category]);
|
|
if (*name == NULL || (*name)[0] == '\0')
|
|
*name = getenv ("LANG");
|
|
}
|
|
|
|
if (*name == NULL || (*name)[0] == '\0'
|
|
|| (__builtin_expect (__libc_enable_secure, 0)
|
|
&& strchr (*name, '/') != NULL))
|
|
*name = (char *) _nl_C_name;
|
|
|
|
if (__builtin_expect (strcmp (*name, _nl_C_name), 1) == 0
|
|
|| __builtin_expect (strcmp (*name, _nl_POSIX_name), 1) == 0)
|
|
{
|
|
/* We need not load anything. The needed data is contained in
|
|
the library itself. */
|
|
*name = (char *) _nl_C_name;
|
|
return _nl_C[category];
|
|
}
|
|
|
|
/* We really have to load some data. First we try the archive,
|
|
but only if there was no LOCPATH environment variable specified. */
|
|
if (__builtin_expect (locale_path == NULL, 1))
|
|
{
|
|
struct locale_data *data = _nl_load_locale_from_archive (category, name);
|
|
if (__builtin_expect (data != NULL, 1))
|
|
return data;
|
|
|
|
/* Nothing in the archive. Set the default path to search below. */
|
|
locale_path = _nl_default_locale_path;
|
|
locale_path_len = sizeof _nl_default_locale_path;
|
|
}
|
|
|
|
/* We really have to load some data. First see whether the name is
|
|
an alias. Please note that this makes it impossible to have "C"
|
|
or "POSIX" as aliases. */
|
|
loc_name = (char *) _nl_expand_alias (*name);
|
|
if (loc_name == NULL)
|
|
/* It is no alias. */
|
|
loc_name = (char *) *name;
|
|
|
|
/* Make a writable copy of the locale name. */
|
|
loc_name = strdupa (loc_name);
|
|
|
|
/* LOCALE can consist of up to four recognized parts for the XPG syntax:
|
|
|
|
language[_territory[.codeset]][@modifier]
|
|
|
|
Beside the first 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 part will be stripped off according to
|
|
the following order:
|
|
(1) codeset
|
|
(2) normalized codeset
|
|
(3) territory
|
|
(4) modifier
|
|
*/
|
|
mask = _nl_explode_name (loc_name, &language, &modifier, &territory,
|
|
&codeset, &normalized_codeset);
|
|
|
|
/* If exactly this locale was already asked for we have an entry with
|
|
the complete name. */
|
|
locale_file = _nl_make_l10nflist (&_nl_locale_file_list[category],
|
|
locale_path, locale_path_len, mask,
|
|
language, territory, codeset,
|
|
normalized_codeset, modifier,
|
|
_nl_category_names[category], 0);
|
|
|
|
if (locale_file == NULL)
|
|
{
|
|
/* Find status record for addressed locale file. We have to search
|
|
through all directories in the locale path. */
|
|
locale_file = _nl_make_l10nflist (&_nl_locale_file_list[category],
|
|
locale_path, locale_path_len, mask,
|
|
language, territory, codeset,
|
|
normalized_codeset, modifier,
|
|
_nl_category_names[category], 1);
|
|
if (locale_file == NULL)
|
|
/* This means we are out of core. */
|
|
return NULL;
|
|
}
|
|
|
|
/* The space for normalized_codeset is dynamically allocated. Free it. */
|
|
if (mask & XPG_NORM_CODESET)
|
|
free ((void *) normalized_codeset);
|
|
|
|
if (locale_file->decided == 0)
|
|
_nl_load_locale (locale_file, category);
|
|
|
|
if (locale_file->data == NULL)
|
|
{
|
|
int cnt;
|
|
for (cnt = 0; locale_file->successor[cnt] != NULL; ++cnt)
|
|
{
|
|
if (locale_file->successor[cnt]->decided == 0)
|
|
_nl_load_locale (locale_file->successor[cnt], category);
|
|
if (locale_file->successor[cnt]->data != NULL)
|
|
break;
|
|
}
|
|
/* Move the entry we found (or NULL) to the first place of
|
|
successors. */
|
|
locale_file->successor[0] = locale_file->successor[cnt];
|
|
locale_file = locale_file->successor[cnt];
|
|
|
|
if (locale_file == NULL)
|
|
return NULL;
|
|
}
|
|
|
|
/* The LC_CTYPE category allows to check whether a locale is really
|
|
usable. If the locale name contains a charset name and the
|
|
charset name used in the locale (present in the LC_CTYPE data) is
|
|
not the same (after resolving aliases etc) we reject the locale
|
|
since using it would irritate users expecting the charset named
|
|
in the locale name. */
|
|
if (codeset != NULL)
|
|
{
|
|
/* Get the codeset information from the locale file. */
|
|
static const int codeset_idx[] =
|
|
{
|
|
[__LC_CTYPE] = _NL_ITEM_INDEX (CODESET),
|
|
[__LC_NUMERIC] = _NL_ITEM_INDEX (_NL_NUMERIC_CODESET),
|
|
[__LC_TIME] = _NL_ITEM_INDEX (_NL_TIME_CODESET),
|
|
[__LC_COLLATE] = _NL_ITEM_INDEX (_NL_COLLATE_CODESET),
|
|
[__LC_MONETARY] = _NL_ITEM_INDEX (_NL_MONETARY_CODESET),
|
|
[__LC_MESSAGES] = _NL_ITEM_INDEX (_NL_MESSAGES_CODESET),
|
|
[__LC_PAPER] = _NL_ITEM_INDEX (_NL_PAPER_CODESET),
|
|
[__LC_NAME] = _NL_ITEM_INDEX (_NL_NAME_CODESET),
|
|
[__LC_ADDRESS] = _NL_ITEM_INDEX (_NL_ADDRESS_CODESET),
|
|
[__LC_TELEPHONE] = _NL_ITEM_INDEX (_NL_TELEPHONE_CODESET),
|
|
[__LC_MEASUREMENT] = _NL_ITEM_INDEX (_NL_MEASUREMENT_CODESET),
|
|
[__LC_IDENTIFICATION] = _NL_ITEM_INDEX (_NL_IDENTIFICATION_CODESET)
|
|
};
|
|
const struct locale_data *data;
|
|
const char *locale_codeset;
|
|
char *clocale_codeset;
|
|
char *ccodeset;
|
|
|
|
data = (const struct locale_data *) locale_file->data;
|
|
locale_codeset =
|
|
(const char *) data->values[codeset_idx[category]].string;
|
|
assert (locale_codeset != NULL);
|
|
/* Note the length of the allocated memory: +3 for up to two slashes
|
|
and the NUL byte. */
|
|
clocale_codeset = (char *) alloca (strlen (locale_codeset) + 3);
|
|
strip (clocale_codeset, locale_codeset);
|
|
|
|
ccodeset = (char *) alloca (strlen (codeset) + 3);
|
|
strip (ccodeset, codeset);
|
|
|
|
if (__gconv_compare_alias (upstr (ccodeset, ccodeset),
|
|
upstr (clocale_codeset,
|
|
clocale_codeset)) != 0)
|
|
/* The codesets are not identical, don't use the locale. */
|
|
return NULL;
|
|
}
|
|
|
|
/* Determine the locale name for which loading succeeded. This
|
|
information comes from the file name. The form is
|
|
<path>/<locale>/LC_foo. We must extract the <locale> part. */
|
|
if (((const struct locale_data *) locale_file->data)->name == NULL)
|
|
{
|
|
char *cp, *endp;
|
|
|
|
endp = strrchr (locale_file->filename, '/');
|
|
cp = endp - 1;
|
|
while (cp[-1] != '/')
|
|
--cp;
|
|
((struct locale_data *) locale_file->data)->name = __strndup (cp,
|
|
endp - cp);
|
|
}
|
|
|
|
/* Determine whether the user wants transliteration or not. */
|
|
if (modifier != NULL && __strcasecmp (modifier, "TRANSLIT") == 0)
|
|
((struct locale_data *) locale_file->data)->use_translit = 1;
|
|
|
|
/* Increment the usage count. */
|
|
if (((const struct locale_data *) locale_file->data)->usage_count
|
|
< MAX_USAGE_COUNT)
|
|
++((struct locale_data *) locale_file->data)->usage_count;
|
|
|
|
return (struct locale_data *) locale_file->data;
|
|
}
|
|
|
|
|
|
/* Calling this function assumes the lock for handling global locale data
|
|
is acquired. */
|
|
void
|
|
internal_function
|
|
_nl_remove_locale (int locale, struct locale_data *data)
|
|
{
|
|
if (--data->usage_count == 0)
|
|
{
|
|
if (data->alloc != ld_archive)
|
|
{
|
|
/* First search the entry in the list of loaded files. */
|
|
struct loaded_l10nfile *ptr = _nl_locale_file_list[locale];
|
|
|
|
/* Search for the entry. It must be in the list. Otherwise it
|
|
is a bug and we crash badly. */
|
|
while ((struct locale_data *) ptr->data != data)
|
|
ptr = ptr->next;
|
|
|
|
/* Mark the data as not available anymore. So when the data has
|
|
to be used again it is reloaded. */
|
|
ptr->decided = 0;
|
|
ptr->data = NULL;
|
|
}
|
|
|
|
/* This does the real work. */
|
|
_nl_unload_locale (data);
|
|
}
|
|
}
|