From 557870f1846990246b80cafdf3e06349302a38a5 Mon Sep 17 00:00:00 2001 From: Tristan Partin Date: Fri, 30 Jun 2023 11:13:29 -0500 Subject: [PATCH v1 2/3] Add locale_is_c function In some places throughout the codebase, there are string comparisons for locales matching C or POSIX. Encapsulate this logic into a single function and use it. --- src/backend/utils/adt/pg_locale.c | 39 ++++++++++++++++++------------- src/backend/utils/init/postinit.c | 4 +--- src/backend/utils/mb/mbutils.c | 5 ++-- src/include/utils/pg_locale.h | 1 + 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index d5003da417..61d5c5dc4c 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -195,6 +195,23 @@ wcstombs_l(char *dest, const wchar_t *src, size_t n, locale_t loc) } #endif + +/* + * Check if a locale is the C locale + * + * POSIX is an alias for C. Passing ingore_case as true will use + * pg_strcasecmp() instead of strcmp(). + */ +bool +locale_is_c(const char *locale, bool ignore_case) +{ + if (!ignore_case) + return strcmp(locale, "C") == 0 || strcmp(locale, "POSIX") == 0; + + return pg_strcasecmp(locale, "C") == 0 || pg_strcasecmp(locale, "POSIX") == 0; +} + + /* * pg_perm_setlocale * @@ -1280,10 +1297,8 @@ lookup_collation_cache(Oid collation, bool set_flags) datum = SysCacheGetAttrNotNull(COLLOID, tp, Anum_pg_collation_collctype); collctype = TextDatumGetCString(datum); - cache_entry->collate_is_c = ((strcmp(collcollate, "C") == 0) || - (strcmp(collcollate, "POSIX") == 0)); - cache_entry->ctype_is_c = ((strcmp(collctype, "C") == 0) || - (strcmp(collctype, "POSIX") == 0)); + cache_entry->collate_is_c = locale_is_c(collcollate, false); + cache_entry->ctype_is_c = locale_is_c(collctype, false); } else { @@ -1331,12 +1346,8 @@ lc_collate_is_c(Oid collation) if (!localeptr) elog(ERROR, "invalid LC_COLLATE setting"); - if (strcmp(localeptr, "C") == 0) - result = true; - else if (strcmp(localeptr, "POSIX") == 0) - result = true; - else - result = false; + result = locale_is_c(localeptr, false); + return (bool) result; } @@ -1384,12 +1395,8 @@ lc_ctype_is_c(Oid collation) if (!localeptr) elog(ERROR, "invalid LC_CTYPE setting"); - if (strcmp(localeptr, "C") == 0) - result = true; - else if (strcmp(localeptr, "POSIX") == 0) - result = true; - else - result = false; + result = locale_is_c(localeptr, false); + return (bool) result; } diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 552cf9d950..544312a099 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -419,9 +419,7 @@ CheckMyDatabase(const char *name, bool am_superuser, bool override_allow_connect " which is not recognized by setlocale().", ctype), errhint("Recreate the database with another locale or install the missing locale."))); - if (strcmp(ctype, "C") == 0 || - strcmp(ctype, "POSIX") == 0) - database_ctype_is_c = true; + database_ctype_is_c = locale_is_c(ctype, false); if (dbform->datlocprovider == COLLPROVIDER_ICU) { diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index 67a1ab2ab2..997156515c 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -39,6 +39,7 @@ #include "mb/pg_wchar.h" #include "utils/builtins.h" #include "utils/memutils.h" +#include "utils/pg_locale.h" #include "utils/syscache.h" #include "varatt.h" @@ -1237,9 +1238,7 @@ pg_bind_textdomain_codeset(const char *domainname) int new_msgenc; #ifndef WIN32 - const char *ctype = setlocale(LC_CTYPE, NULL); - - if (pg_strcasecmp(ctype, "C") == 0 || pg_strcasecmp(ctype, "POSIX") == 0) + if (locale_is_c(locale_ctype, true)) #endif if (encoding != PG_SQL_ASCII && raw_pg_bind_textdomain_codeset(domainname, encoding)) diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index 6447bea8e0..e08d96e099 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -54,6 +54,7 @@ extern PGDLLIMPORT bool database_ctype_is_c; extern bool check_locale(int category, const char *locale, char **canonname); extern char *pg_perm_setlocale(int category, const char *locale); +extern bool locale_is_c(const char *locale, bool ignore_case); extern bool lc_collate_is_c(Oid collation); extern bool lc_ctype_is_c(Oid collation); -- Tristan Partin Neon (https://neon.tech)