diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2024-08-14 15:02:12 +1200 |
|---|---|---|
| committer | Thomas Munro <tmunro@postgresql.org> | 2024-08-14 15:04:14 +1200 |
| commit | bf3401fe813ad3b6b34e5e9daf8fbd03540a2294 (patch) | |
| tree | 504451bc84628bd0aaad8a40e0194eb039bb584f | |
| parent | 4c1b4cdb86a7a3a97349bb636f34a259abe0187d (diff) | |
| download | postgresql-bf3401fe813ad3b6b34e5e9daf8fbd03540a2294.tar.gz postgresql-bf3401fe813ad3b6b34e5e9daf8fbd03540a2294.zip | |
Harmonize MinGW CODESET lookup with MSVC.
Historically, MinGW environments lacked some Windows API calls, so we
took a different code path in win32_langinfo(). Somehow, the code
change in commit 35eeea62 (removing setlocale() calls) caused one
particular 001_initdb.pl test to fail on MinGW + ICU builds, because
pg_import_system_collations() found no collations. It might take a
MinGW user to discover the exact reason.
Updating that function to use the same code as MSVC seems to fix that
test, so lets do that. (There are plenty more places that test for MSVC
unnecessarily, to be investigated later.)
While here, also rename the helper function win32_langinfo() to
win32_get_codeset(), to explain what it does less confusingly; it's not
really a general langinfo() substitute.
Noticed by triggering the optional MinGW CI task; no build farm animals
failed.
Discussion: https://postgr.es/m/CA%2BhUKGKBWfhXQ3J%2B2Lj5PhKvQnGD%3DsywA0XQcb7boTCf%3DerVLg%40mail.gmail.com
| -rw-r--r-- | src/port/chklocale.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/port/chklocale.c b/src/port/chklocale.c index 99e27ed6de5..9506cd87ed8 100644 --- a/src/port/chklocale.c +++ b/src/port/chklocale.c @@ -193,7 +193,7 @@ static const struct encoding_match encoding_match_list[] = { #ifdef WIN32 /* - * On Windows, use CP<code page number> instead of the nl_langinfo() result + * On Windows, use CP<code page number> instead of CODESET. * * This routine uses GetLocaleInfoEx() to parse short locale names like * "de-DE", "fr-FR", etc. If those cannot be parsed correctly process falls @@ -203,12 +203,10 @@ static const struct encoding_match encoding_match_list[] = { * Returns a malloc()'d string for the caller to free. */ static char * -win32_langinfo(const char *ctype) +win32_get_codeset(const char *ctype) { char *r = NULL; char *codepage; - -#if defined(_MSC_VER) uint32 cp; WCHAR wctype[LOCALE_NAME_MAX_LENGTH]; @@ -233,7 +231,6 @@ win32_langinfo(const char *ctype) } } else -#endif { /* * Locale format on Win32 is <Language>_<Country>.<CodePage>. For @@ -336,7 +333,7 @@ pg_get_encoding_from_locale(const char *ctype, bool write_message) freelocale(loc); #else - sys = win32_langinfo(ctype); + sys = win32_get_codeset(ctype); #endif if (!sys) |