diff options
| author | Jeff Davis <jdavis@postgresql.org> | 2023-05-08 20:50:51 -0700 |
|---|---|---|
| committer | Jeff Davis <jdavis@postgresql.org> | 2023-05-08 20:50:51 -0700 |
| commit | 455f948b0d03a556533a7e4a1a8abf45f0eb202e (patch) | |
| tree | 91f4331a9b4efe4565544376728799f4049d6408 /src/bin/initdb/initdb.c | |
| parent | 5698f07947396e1a7cd6564390306aafa26fc189 (diff) | |
| download | postgresql-455f948b0d03a556533a7e4a1a8abf45f0eb202e.tar.gz | |
Revert "ICU: do not convert locale 'C' to 'en-US-u-va-posix'."
This reverts commit f7faa9976cc0504c027a20ed66ceca9018041dd4.
Discussion: https://postgr.es/m/483826.1683582475@sss.pgh.pa.us
Diffstat (limited to 'src/bin/initdb/initdb.c')
| -rw-r--r-- | src/bin/initdb/initdb.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 4086834458..2c208ead01 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -2238,10 +2238,24 @@ icu_language_tag(const char *loc_str) { #ifdef USE_ICU UErrorCode status; + char lang[ULOC_LANG_CAPACITY]; char *langtag; size_t buflen = 32; /* arbitrary starting buffer size */ const bool strict = true; + status = U_ZERO_ERROR; + uloc_getLanguage(loc_str, lang, ULOC_LANG_CAPACITY, &status); + if (U_FAILURE(status)) + { + pg_fatal("could not get language from locale \"%s\": %s", + loc_str, u_errorName(status)); + return NULL; + } + + /* C/POSIX locales aren't handled by uloc_getLanguageTag() */ + if (strcmp(lang, "c") == 0 || strcmp(lang, "posix") == 0) + return pstrdup("en-US-u-va-posix"); + /* * A BCP47 language tag doesn't have a clearly-defined upper limit * (cf. RFC5646 section 4.4). Additionally, in older ICU versions, @@ -2313,7 +2327,8 @@ icu_validate_locale(const char *loc_str) /* check for special language name */ if (strcmp(lang, "") == 0 || - strcmp(lang, "root") == 0 || strcmp(lang, "und") == 0) + strcmp(lang, "root") == 0 || strcmp(lang, "und") == 0 || + strcmp(lang, "c") == 0 || strcmp(lang, "posix") == 0) found = true; /* search for matching language within ICU */ |