-/* Copyright (C) 1991, 92, 95-99, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
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. */
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
#include <alloca.h>
#include <argz.h>
#include <errno.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
#include <locale.h>
#include <stdlib.h>
#include <string.h>
#endif
-/* Define an array of category names (also the environment variable names),
- indexed by integral category. */
-const char *const _nl_category_names[] =
+/* Define an array of category names (also the environment variable names). */
+const struct catnamestr_t _nl_category_names attribute_hidden =
{
#define DEFINE_CATEGORY(category, category_name, items, a) \
- [category] = category_name,
+ category_name,
#include "categories.def"
-#undef DEFINE_CATEGORY
- [LC_ALL] = "LC_ALL"
+#undef DEFINE_CATEGORY
};
+
+const uint8_t _nl_category_name_idxs[__LC_LAST] attribute_hidden =
+ {
+#define DEFINE_CATEGORY(category, category_name, items, a) \
+ [category] = offsetof (struct catnamestr_t, CATNAMEMF (__LINE__)),
+#include "categories.def"
+#undef DEFINE_CATEGORY
+ };
+
/* An array of their lengths, for convenience. */
-const size_t _nl_category_name_sizes[] =
+const uint8_t _nl_category_name_sizes[] attribute_hidden =
{
#define DEFINE_CATEGORY(category, category_name, items, a) \
[category] = sizeof (category_name) - 1,
/* Lock for protecting global data. */
-__libc_lock_define_initialized (, __libc_setlocale_lock attribute_hidden)
+__libc_rwlock_define_initialized (, __libc_setlocale_lock attribute_hidden)
/* Defined in loadmsgcat.c. */
extern int _nl_msg_cat_cntr;
/* Construct a new composite name. */
-static inline char *
-new_composite_name (int category, const char *newnames[__LC_LAST])
+static char *
+new_composite_name (int category, const char **newnames)
{
size_t last_len = 0;
size_t cumlen = 0;
for (i = 0; i < __LC_LAST; ++i)
if (i != LC_ALL)
{
- const char *name = (category == LC_ALL ? newnames[i] :
- category == i ? newnames[0] :
- _nl_global_locale.__names[i]);
+ const char *name = (category == LC_ALL ? newnames[i]
+ : category == i ? newnames[0]
+ : _nl_global_locale.__names[i]);
last_len = strlen (name);
cumlen += _nl_category_name_sizes[i] + 1 + last_len + 1;
- if (i > 0 && same && strcmp (name, newnames[0]) != 0)
+ if (same && name != newnames[0] && strcmp (name, newnames[0]) != 0)
same = 0;
}
if (i != LC_ALL)
{
/* Add "CATEGORY=NAME;" to the string. */
- const char *name = (category == LC_ALL ? newnames[i] :
- category == i ? newnames[0] :
- _nl_global_locale.__names[i]);
- p = __stpcpy (p, _nl_category_names[i]);
+ const char *name = (category == LC_ALL ? newnames[i]
+ : category == i ? newnames[0]
+ : _nl_global_locale.__names[i]);
+ p = __stpcpy (p, _nl_category_names_get (i));
*p++ = '=';
p = __stpcpy (p, name);
*p++ = ';';
/* Put NAME in _nl_global_locale.__names. */
-static inline void
+static void
setname (int category, const char *name)
{
if (_nl_global_locale.__names[category] == name)
}
/* Put DATA in *_nl_current[CATEGORY]. */
-static inline void
-setdata (int category, struct locale_data *data)
+static void
+setdata (int category, struct __locale_data *data)
{
if (CATEGORY_USED (category))
{
if (locale == NULL)
return (char *) _nl_global_locale.__names[category];
+ /* Protect global data. */
+ __libc_rwlock_wrlock (__libc_setlocale_lock);
+
if (strcmp (locale, _nl_global_locale.__names[category]) == 0)
- /* Changing to the same thing. */
- return (char *) _nl_global_locale.__names[category];
+ {
+ /* Changing to the same thing. */
+ __libc_rwlock_unlock (__libc_setlocale_lock);
+
+ return (char *) _nl_global_locale.__names[category];
+ }
/* We perhaps really have to load some data. So we determine the
path in which to look for the data now. The environment variable
if (locpath_var != NULL && locpath_var[0] != '\0')
{
if (__argz_create_sep (locpath_var, ':',
- &locale_path, &locale_path_len) != 0)
- return NULL;
-
- if (__argz_add_sep (&locale_path, &locale_path_len,
- _nl_default_locale_path, ':') != 0)
- return NULL;
+ &locale_path, &locale_path_len) != 0
+ || __argz_add_sep (&locale_path, &locale_path_len,
+ _nl_default_locale_path, ':') != 0)
+ {
+ __libc_rwlock_unlock (__libc_setlocale_lock);
+ return NULL;
+ }
}
if (category == LC_ALL)
composite locale name. This is a semi-colon separated list
of entries of the form `CATEGORY=VALUE'. */
const char *newnames[__LC_LAST];
- struct locale_data *newdata[__LC_LAST];
+ struct __locale_data *newdata[__LC_LAST];
+ /* Copy of the locale argument, for in-place splitting. */
+ char *locale_copy = NULL;
/* Set all name pointers to the argument name. */
for (category = 0; category < __LC_LAST; ++category)
if (category != LC_ALL)
newnames[category] = (char *) locale;
- if (__builtin_expect (strchr (locale, ';') != NULL, 0))
+ if (__glibc_unlikely (strchr (locale, ';') != NULL))
{
/* This is a composite name. Make a copy and split it up. */
- char *np = strdupa (locale);
+ locale_copy = __strdup (locale);
+ if (__glibc_unlikely (locale_copy == NULL))
+ {
+ __libc_rwlock_unlock (__libc_setlocale_lock);
+ return NULL;
+ }
+ char *np = locale_copy;
char *cp;
int cnt;
for (cnt = 0; cnt < __LC_LAST; ++cnt)
if (cnt != LC_ALL
&& (size_t) (cp - np) == _nl_category_name_sizes[cnt]
- && memcmp (np, _nl_category_names[cnt], cp - np) == 0)
+ && (memcmp (np, (_nl_category_names_get (cnt)), cp - np)
+ == 0))
break;
if (cnt == __LC_LAST)
- /* Bogus category name. */
- ERROR_RETURN;
+ {
+ error_return:
+ __libc_rwlock_unlock (__libc_setlocale_lock);
+ free (locale_copy);
+
+ /* Bogus category name. */
+ ERROR_RETURN;
+ }
/* Found the category this clause sets. */
newnames[cnt] = ++cp;
for (cnt = 0; cnt < __LC_LAST; ++cnt)
if (cnt != LC_ALL && newnames[cnt] == locale)
/* The composite name did not specify all categories. */
- ERROR_RETURN;
+ goto error_return;
}
- /* Protect global data. */
- __libc_lock_lock (__libc_setlocale_lock);
-
/* Load the new data for each category. */
while (category-- > 0)
if (category != LC_ALL)
break;
}
- /* We must not simply free a global locale since we have no
- control over the usage. So we mark it as un-deletable. */
+ /* We must not simply free a global locale since we have
+ no control over the usage. So we mark it as
+ un-deletable. And yes, the 'if' is needed, the data
+ might be in read-only memory. */
if (newdata[category]->usage_count != UNDELETABLE)
newdata[category]->usage_count = UNDELETABLE;
/* Make a copy of locale name. */
if (newnames[category] != _nl_C_name)
{
- newnames[category] = __strdup (newnames[category]);
- if (newnames[category] == NULL)
- break;
+ if (strcmp (newnames[category],
+ _nl_global_locale.__names[category]) == 0)
+ newnames[category] = _nl_global_locale.__names[category];
+ else
+ {
+ newnames[category] = __strdup (newnames[category]);
+ if (newnames[category] == NULL)
+ break;
+ }
}
}
}
else
for (++category; category < __LC_LAST; ++category)
- if (category != LC_ALL && newnames[category] != _nl_C_name)
+ if (category != LC_ALL && newnames[category] != _nl_C_name
+ && newnames[category] != _nl_global_locale.__names[category])
free ((char *) newnames[category]);
/* Critical section left. */
- __libc_lock_unlock (__libc_setlocale_lock);
+ __libc_rwlock_unlock (__libc_setlocale_lock);
- /* Free the resources (the locale path variable. */
+ /* Free the resources. */
free (locale_path);
+ free (locale_copy);
return composite;
}
else
{
- struct locale_data *newdata = NULL;
+ struct __locale_data *newdata = NULL;
const char *newname[1] = { locale };
- /* Protect global data. */
- __libc_lock_lock (__libc_setlocale_lock);
-
if (CATEGORY_USED (category))
{
/* Only actually load the data if anything will use it. */
/* We must not simply free a global locale since we have no
control over the usage. So we mark it as un-deletable.
- Note: do not remove the `if', it's necessary to copy with
+ Note: do not remove the `if', it's necessary to cope with
the builtin locale data. */
if (newdata->usage_count != UNDELETABLE)
newdata->usage_count = UNDELETABLE;
}
/* Critical section left. */
- __libc_lock_unlock (__libc_setlocale_lock);
+ __libc_rwlock_unlock (__libc_setlocale_lock);
/* Free the resources (the locale path variable. */
free (locale_path);
}
libc_hidden_def (setlocale)
-static void
+static void __libc_freeres_fn_section
free_category (int category,
- struct locale_data *here, struct locale_data *c_data)
+ struct __locale_data *here, struct __locale_data *c_data)
{
struct loaded_l10nfile *runp = _nl_locale_file_list[category];
while (runp != NULL)
{
struct loaded_l10nfile *curr = runp;
- struct locale_data *data = (struct locale_data *) runp->data;
+ struct __locale_data *data = (struct __locale_data *) runp->data;
if (data != NULL && data != c_data)
_nl_unload_locale (data);
}
}
-static void __attribute__ ((unused))
-free_mem (void)
+/* This is called from iconv/gconv_db.c's free_mem, as locales must
+ be freed before freeing gconv steps arrays. */
+void __libc_freeres_fn_section
+_nl_locale_subfreeres (void)
{
#ifdef NL_CURRENT_INDIRECT
/* We don't use the loop because we want to have individual weak
# define DEFINE_CATEGORY(category, category_name, items, a) \
if (CATEGORY_USED (category)) \
{ \
- extern struct locale_data _nl_C_##category; \
+ extern struct __locale_data _nl_C_##category; \
weak_extern (_nl_C_##category) \
free_category (category, *_nl_current_##category, &_nl_C_##category); \
}
not called _nl_unload_locale on them above. */
_nl_archive_subfreeres ();
}
-text_set_element (__libc_subfreeres, free_mem);
projects / thirdparty / glibc.git / blobdiff