path: root/src/locale/newlocale.c
diff options
authorRich Felker <>2015-05-27 03:22:52 -0400
committerRich Felker <>2015-05-27 03:27:59 -0400
commit61a3364d246e72b903da8b76c2e27a225a51351e (patch)
tree8845c8e1798280285b6f0b27244d978eb602c300 /src/locale/newlocale.c
parent63c188ec42e76ff768e81f6b65b11c68fc43351e (diff)
overhaul locale internals to treat categories roughly uniformly
previously, LC_MESSAGES was treated specially as the only category which could be set to a locale name without a definition file, in order to facilitate gettext message translations when no libc locale was available. LC_NUMERIC was completely un-settable, and LC_CTYPE stored a flag intended to be used for a possible future byte-based C locale, instead of storing a __locale_map pointer like the other categories use. this patch changes all categories to be represented by pointers to __locale_map structures, and allows locale names without definition files to be treated as valid locales with trivial definition when used in any category. outwardly visible functional changes should be minor, limited mainly to the strings read back from setlocale and the way gettext handles translations in categories other than LC_MESSAGES. various internal refactoring has also been performed, and improvements in const correctness have been made.
Diffstat (limited to 'src/locale/newlocale.c')
1 files changed, 3 insertions, 4 deletions
diff --git a/src/locale/newlocale.c b/src/locale/newlocale.c
index 39501d0c..4e0cbd34 100644
--- a/src/locale/newlocale.c
+++ b/src/locale/newlocale.c
@@ -8,17 +8,16 @@ locale_t __newlocale(int mask, const char *name, locale_t loc)
int i;
if (!loc) {
- loc = calloc(1, sizeof *loc + LOCALE_NAME_MAX + 1);
+ loc = malloc(sizeof *loc);
if (!loc) return 0;
- loc->messages_name = (void *)(loc+1);
for (i=0; i<LC_ALL; i++)
if (!(mask & (1<<i)))
- __setlocalecat(loc, i, "");
+ loc->cat[i] = __get_locale(i, "");
for (i=0; i<LC_ALL; i++)
if (mask & (1<<i))
- __setlocalecat(loc, i, name);
+ loc->cat[i] = __get_locale(i, name);
return loc;