i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libroot/locale: Handle current_locale() being called early in initialization.

Browse Source 
Fixes #19954.
This commit is contained in:
Augustin Cavalier
2026-03-23 14:24:32 -04:00
parent 89c3592b51
commit c977e8a221
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/libroot/posix/locale/locale_t.cpp
+15 -10
View File
@@ -271,11 +271,26 @@ getlocalename_l(int category, locale_t l)
} }
extern "C" locale_t
__posix_locale_t()
{
static LocaleBackendData posix_locale_t;
posix_locale_t.backend = NULL;
posix_locale_t.databridge = NULL;
return &posix_locale_t;
}
extern "C" locale_t extern "C" locale_t
__current_locale_t() __current_locale_t()
{ {
locale_t locale = (locale_t)GetCurrentLocaleInfo(); locale_t locale = (locale_t)GetCurrentLocaleInfo();
if (locale == NULL) { if (locale == NULL) {
// If we're called during initialization, the globals might not have
// been set up yet.
if (gGlobalLocaleDataBridge.posixLanginfo == NULL)
return __posix_locale_t();
static LocaleBackendData global_locale_t; static LocaleBackendData global_locale_t;
global_locale_t.backend = gGlobalLocaleBackend; global_locale_t.backend = gGlobalLocaleBackend;
global_locale_t.databridge = &gGlobalLocaleDataBridge; global_locale_t.databridge = &gGlobalLocaleDataBridge;
@@ -284,13 +299,3 @@ __current_locale_t()
return locale; return locale;
} }
extern "C" locale_t
__posix_locale_t()
{
static LocaleBackendData posix_locale_t;
posix_locale_t.backend = NULL;
posix_locale_t.databridge = NULL;
return &posix_locale_t;
}