Re: [musl] setlocale() again

[Alastair Houghton <ahoughton@apple.com>]

> On 18 Sep 2023, at 15:18, Alastair Houghton <ahoughton@apple.com> wrote:
> 
> Hi all (Rich especially though :-))
> 
> Has anyone had time to take a look at this? I’d like to make some progress on this front if possible.
> 
> Kind regards,
> 
> Alastair.


Maybe I’ve missed a reply somewhere along the lines; here’s a tentative patch that just does the simple thing of making setlocale(LC_ALL, "") pick the C.UTF-8 locale if it’s unable to find the locale specified in the environment.

This will mean that setlocale(LC_ALL, "non-existent locale") will return NULL, which does have an impact on users if they don’t have a locale installed for Musl but *do* have locale data installed for some other software; in that case, their other software won’t be localized until they also install data for Musl.

(This is the same as current Glibc behaviour.)

Kind regards,

Alastair

---- snip ----

diff --git a/src/locale/locale_map.c b/src/locale/locale_map.c
index da61f7fc..bd11f2ca 100644
--- a/src/locale/locale_map.c
+++ b/src/locale/locale_map.c
@@ -31,7 +31,7 @@ static const char envvars[][12] = {
 volatile int __locale_lock[1];
 volatile int *const __locale_lockptr = __locale_lock;
 
-const struct __locale_map *__get_locale(int cat, const char *val)
+const struct __locale_map *__get_locale(int cat, const char *locale)
 {
        static void *volatile loc_head;
        const struct __locale_map *p;
@@ -39,6 +39,7 @@ const struct __locale_map *__get_locale(int cat, const char *val)
        const char *path = 0, *z;
        char buf[256];
        size_t l, n;
+       const char *val = locale;
 
        if (!*val) {
                (val = getenv("LC_ALL")) && *val ||
@@ -92,18 +93,9 @@ const struct __locale_map *__get_locale(int cat, const char *val)
                }
        }
 
-       /* If no locale definition was found, make a locale map
-        * object anyway to store the name, which is kept for the
-        * sake of being able to do message translations at the
-        * application level. */
-       if (!new && (new = malloc(sizeof *new))) {
-               new->map = __c_dot_utf8.map;
-               new->map_size = __c_dot_utf8.map_size;
-               memcpy(new->name, val, n);
-               new->name[n] = 0;
-               new->next = loc_head;
-               loc_head = new;
-       }
+       /* If no locale definition was found, and we specified a
+        * locale name of "", return the C.UTF-8 locale. */
+       if (!new && !*locale) new = (void *)&__c_dot_utf8;
 
        /* For LC_CTYPE, never return a null pointer unless the
         * requested name was "C" or "POSIX". */