mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Blind attempt to fix _configthreadlocale() failures on MinGW.

Browse Source 
Apparently, some builds of MinGW contain a version of
_configthreadlocale() that always returns -1, indicating failure.
Rather than treating that as a curl-up-and-die condition, soldier on
as though the function didn't exist.  This leaves us without thread
safety on such MinGW versions, but we didn't have it anyway.

Discussion: https://postgr.es/m/d06a16bc-52d6-9f0d-2379-21242d7dbe81@2ndQuadrant.com
This commit is contained in:
Tom Lane 2019-01-23 22:46:45 -05:00
parent ae366aa577
commit 2cf91ccb73
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/ecpg/ecpglib/descriptor.c
View File

@ -519,7 +519,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
} }
#ifdef HAVE__CONFIGTHREADLOCALE #ifdef HAVE__CONFIGTHREADLOCALE
if (stmt.oldthreadlocale != -1) if (stmt.oldthreadlocale != -1)
_configthreadlocale(stmt.oldthreadlocale); (void) _configthreadlocale(stmt.oldthreadlocale);
#endif #endif
#endif #endif
} }

20
src/interfaces/ecpg/ecpglib/execute.c
View File

@ -1778,7 +1778,9 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator,
* Make sure we do NOT honor the locale for numeric input/output since the * Make sure we do NOT honor the locale for numeric input/output since the
* database wants the standard decimal point. If available, use * database wants the standard decimal point. If available, use
* uselocale() for this because it's thread-safe. Windows doesn't have * uselocale() for this because it's thread-safe. Windows doesn't have
* that, but it usually does have _configthreadlocale(). * that, but it usually does have _configthreadlocale(). In some versions
* of MinGW, _configthreadlocale() exists but always returns -1 --- so
* treat that situation as if the function doesn't exist.
*/ */
#ifdef HAVE_USELOCALE #ifdef HAVE_USELOCALE
stmt->clocale = newlocale(LC_NUMERIC_MASK, "C", (locale_t) 0); stmt->clocale = newlocale(LC_NUMERIC_MASK, "C", (locale_t) 0);
@ -1796,11 +1798,6 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator,
#else #else
#ifdef HAVE__CONFIGTHREADLOCALE #ifdef HAVE__CONFIGTHREADLOCALE
stmt->oldthreadlocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); stmt->oldthreadlocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
if (stmt->oldthreadlocale == -1)
{
ecpg_do_epilogue(stmt);
return false;
}
#endif #endif
stmt->oldlocale = ecpg_strdup(setlocale(LC_NUMERIC, NULL), lineno); stmt->oldlocale = ecpg_strdup(setlocale(LC_NUMERIC, NULL), lineno);
if (stmt->oldlocale == NULL) if (stmt->oldlocale == NULL)
@ -2017,12 +2014,17 @@ ecpg_do_epilogue(struct statement *stmt)
uselocale(stmt->oldlocale); uselocale(stmt->oldlocale);
#else #else
if (stmt->oldlocale) if (stmt->oldlocale)
{
setlocale(LC_NUMERIC, stmt->oldlocale); setlocale(LC_NUMERIC, stmt->oldlocale);
#ifdef HAVE__CONFIGTHREADLOCALE #ifdef HAVE__CONFIGTHREADLOCALE
_configthreadlocale(stmt->oldthreadlocale);
/*
* This is a bit trickier than it looks: if we failed partway through
* statement initialization, oldthreadlocale could still be 0. But that's
* okay because a call with 0 is defined to be a no-op.
*/
if (stmt->oldthreadlocale != -1)
(void) _configthreadlocale(stmt->oldthreadlocale);
#endif #endif
}
#endif #endif
free_statement(stmt); free_statement(stmt);