1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't expose Windows' mbstowcs_l() and wcstombs_l().

Browse Source 
Windows has similar functions with leading underscores.  Previously, we
provided the rename via a macro in win32_port.h.  In fact its functions
are not always good replacements for the Unix functions, since they
can't deal with UTF-8.  They are only currently used by pg_locale.c,
which is careful to redirect to other Windows routines for UTF-8.  Given
that portability hazard, it seem unlikely to be a good idea to encourage
any other code to think of these functions as being available outside
pg_locale.c.  Any code that thinks it wants these functions probably
wants our wchar2char() or char2wchar() routines instead, or it won't
actually work on Windows in UTF-8 databases.

Furthermore, some major libc implementations including glibc don't have
them (they only have the standard variants without _l), so external code
is very unlikely to require them to exist.

Reviewed-by: Peter Eisentraut <peter@eisentraut.org>
Discussion: https://postgr.es/m/CA%2BhUKG%2Bt_CHPzEoPnKyARJBJgE9-GxNajJo6ZuSfRK_KWFO%2B6w%40mail.gmail.com
This commit is contained in:
Thomas Munro 2023-07-11 09:34:22 +12:00
parent a8b7424684
commit 4e9fa6d56b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/utils/adt/pg_locale.c
View File

@ -154,36 +154,41 @@ static void icu_set_collation_attributes(UCollator *collator, const char *loc,
UErrorCode *status); UErrorCode *status);
#endif #endif
#ifndef WIN32
/* /*
* POSIX doesn't define _l-variants of these functions, but several systems * POSIX doesn't define _l-variants of these functions, but several systems
* have them. We provide our own replacements here. For Windows, we have * have them. We provide our own replacements here.
* macros in win32_port.h.
*/ */
#ifndef HAVE_MBSTOWCS_L #ifndef HAVE_MBSTOWCS_L
static size_t static size_t
mbstowcs_l(wchar_t *dest, const char *src, size_t n, locale_t loc) mbstowcs_l(wchar_t *dest, const char *src, size_t n, locale_t loc)
{ {
#ifdef WIN32
return _mbstowcs_l(dest, src, n, loc);
#else
size_t result; size_t result;
locale_t save_locale = uselocale(loc); locale_t save_locale = uselocale(loc);
result = mbstowcs(dest, src, n); result = mbstowcs(dest, src, n);
uselocale(save_locale); uselocale(save_locale);
return result; return result;
#endif
} }
#endif #endif
#ifndef HAVE_WCSTOMBS_L #ifndef HAVE_WCSTOMBS_L
static size_t static size_t
wcstombs_l(char *dest, const wchar_t *src, size_t n, locale_t loc) wcstombs_l(char *dest, const wchar_t *src, size_t n, locale_t loc)
{ {
#ifdef WIN32
return _wcstombs_l(dest, src, n, loc);
#else
size_t result; size_t result;
locale_t save_locale = uselocale(loc); locale_t save_locale = uselocale(loc);
result = wcstombs(dest, src, n); result = wcstombs(dest, src, n);
uselocale(save_locale); uselocale(save_locale);
return result; return result;
}
#endif #endif
}
#endif #endif
/* /*

2
src/include/port/win32_port.h
View File

@ -455,8 +455,6 @@ extern int _pglstat64(const char *name, struct stat *buf);
#define strcoll_l _strcoll_l #define strcoll_l _strcoll_l
#define strxfrm_l _strxfrm_l #define strxfrm_l _strxfrm_l
#define wcscoll_l _wcscoll_l #define wcscoll_l _wcscoll_l
#define wcstombs_l _wcstombs_l
#define mbstowcs_l _mbstowcs_l
/* /*
* Versions of libintl >= 0.18? try to replace setlocale() with a macro * Versions of libintl >= 0.18? try to replace setlocale() with a macro