aboutsummaryrefslogtreecommitdiff
path: root/locale/setlocale.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-04 01:41:55 +0000
committerRoland McGrath <roland@gnu.org>2002-08-04 01:41:55 +0000
commit30c14c31ae6ac7c8db692fc23d0901e4d479f7af (patch)
tree25e403cd215f6d2ca484ae20a51ae41019ce19db /locale/setlocale.c
parent509d1b68421a9dc02605540615d241b48bf90a13 (diff)
downloadglibc-30c14c31ae6ac7c8db692fc23d0901e4d479f7af.tar
glibc-30c14c31ae6ac7c8db692fc23d0901e4d479f7af.tar.gz
glibc-30c14c31ae6ac7c8db692fc23d0901e4d479f7af.tar.bz2
glibc-30c14c31ae6ac7c8db692fc23d0901e4d479f7af.zip
* locale/setlocale.c (_nl_current_names): Variable moved ...
* locale/localename.c (_nl_current_names): ... here, new file. Make it global, with attribute_hidden. * locale/localeinfo.h: Declare it. * locale/Makefile (aux): Add localename. * locale/localename.c (__current_locale_name): New function. * include/locale.h (__current_locale_name): Declare it. * intl/dcigettext.c (guess_category_value): Use that instead of calling setlocale. * locale/locale.h [__USE_GNU] (locale_t): New type alias of __locale_t. [__USE_GNU] (newlocale, duplocale, freelocale, uselocale): New decls. [__USE_GNU] (LC_GLOBAL_LOCALE): New macro. * locale/newlocale.c: Add alias to __ name. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/uselocale.c: New file. * locale/Makefile (routines): Add it. * locale/Versions (libc: GLIBC_2.3): New set. Add newlocale, duplocale, freelocale, uselocale. (libc: GLIBC_PRIVATE): Add __uselocale. * locale/localeinfo.h [SHARED] (_NL_CURRENT_LOCALE): New macro, defined to fetch a tsd value. (_NL_CURRENT_DATA): Define using that. (_NL_CURRENT, _NL_CURRENT_WSTR, _NL_CURRENT_WORD): Define using that. (_NL_CURRENT_DEFINE): Define to empty. [! SHARED]: Decls of _nl_current_CATEGORY and _nl_current conditionalized on this. * locale/xlocale.c (NL_C_INTIIALIZER): New macro, taking initializer of _nl_C_locobj. [SHARED] (_nl_global_locale): New variable, using that initializer. (_nl_C_locobj): Use new macro for initialzier. * locale/setlocale.c [! SHARED] (_nl_current): Conditionalize on this. [! SHARED] (CATEGORY_USED): New macro. [SHARED] (CATEGORY_USED, _nl_C): New macros. (setdata, setlocale): Use that macro instead of examining _nl_current. (setdata): Set the slot in _nl_global_locale. Conditionalize setting of _nl_current on [! SHARED]. * locale/findlocale.c [SHARED] (_nl_C): Define as a macro instead of declaration as an extern. * locale/newlocale.c (__newlocale): Use _nl_C_locobj instead of _nl_C. * include/locale.h: Use libc_hidden_proto for setlocale. * locale/setlocale.c: Add libc_hidden_def. * locale/setlocale.c (free_mem): Use _NL_CURRENT_DATA.
Diffstat (limited to 'locale/setlocale.c')
-rw-r--r--locale/setlocale.c46
1 files changed, 28 insertions, 18 deletions
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 87573024d3..50963d152c 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -27,6 +27,8 @@
#include "localeinfo.h"
+#ifndef SHARED
+
/* For each category declare two external variables (with weak references):
extern const struct locale_data *_nl_current_CATEGORY;
This points to the current locale's in-core data for CATEGORY.
@@ -35,6 +37,8 @@
Both are weak references; if &_nl_current_CATEGORY is zero,
then nothing is using the locale data. */
#define DEFINE_CATEGORY(category, category_name, items, a) \
+weak_extern (_nl_current_##category) \
+weak_extern (_nl_C_##category) \
extern struct locale_data *_nl_current_##category; \
extern struct locale_data _nl_C_##category;
#include "categories.def"
@@ -63,6 +67,19 @@ struct locale_data *const _nl_C[] attribute_hidden =
#undef DEFINE_CATEGORY
};
+# define CATEGORY_USED(category) (_nl_current[category] != NULL)
+
+#else
+
+/* The shared library always loads all the categories,
+ and the current global settings are kept in _nl_global_locale. */
+
+# define _nl_C (_nl_C_locobj.__locales)
+
+# define CATEGORY_USED(category) (1)
+
+#endif
+
/* Define an array of category names (also the environment variable names),
indexed by integral category. */
@@ -105,18 +122,6 @@ static void (*const _nl_category_postload[]) (void) =
};
-/* Name of current locale for each individual category.
- Each is malloc'd unless it is nl_C_name. */
-static const char *_nl_current_names[] =
- {
-#define DEFINE_CATEGORY(category, category_name, items, a) \
- [category] = _nl_C_name,
-#include "categories.def"
-#undef DEFINE_CATEGORY
- [LC_ALL] = _nl_C_name /* For LC_ALL. */
- };
-
-
/* Lock for protecting global data. */
__libc_lock_define_initialized (, __libc_setlocale_lock attribute_hidden)
@@ -200,20 +205,24 @@ setname (int category, const char *name)
_nl_current_names[category] = name;
}
-
/* Put DATA in *_nl_current[CATEGORY]. */
static inline void
setdata (int category, struct locale_data *data)
{
- if (_nl_current[category] != NULL)
+ if (CATEGORY_USED (category))
{
+#ifdef SHARED
+ _nl_global_locale.__locales[category] = data;
+#endif
+#ifndef SHARED
+# warning when uselocale exists it will need the line above too
*_nl_current[category] = data;
+#endif
if (_nl_category_postload[category])
(*_nl_category_postload[category]) ();
}
}
-
char *
setlocale (int category, const char *locale)
{
@@ -371,7 +380,7 @@ setlocale (int category, const char *locale)
/* Protect global data. */
__libc_lock_lock (__libc_setlocale_lock);
- if (_nl_current[category] != NULL)
+ if (CATEGORY_USED (category))
{
/* Only actually load the data if anything will use it. */
newdata = _nl_find_locale (locale_path, locale_path_len, category,
@@ -409,7 +418,7 @@ setlocale (int category, const char *locale)
}
else
{
- if (_nl_current[category] != NULL)
+ if (CATEGORY_USED (category))
setdata (category, newdata);
setname (category, newname[0]);
@@ -429,6 +438,7 @@ setlocale (int category, const char *locale)
return (char *) newname[0];
}
}
+libc_hidden_def (setlocale)
static void __attribute__ ((unused))
free_mem (void)
@@ -438,7 +448,7 @@ free_mem (void)
for (category = 0; category < __LC_LAST; ++category)
if (category != LC_ALL)
{
- struct locale_data *here = *_nl_current[category];
+ struct locale_data *here = _NL_CURRENT_DATA (category);
struct loaded_l10nfile *runp = _nl_locale_file_list[category];
/* If this category is already "C" don't do anything. */