database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Revert "Detect setlocale(LC_CTYPE, NULL) clobbering previous return values."

Browse Source 
This reverts commit b76e76be46.  The
buildfarm yielded no related failures.
This commit is contained in:
Noah Misch
2015-06-20 12:08:48 -04:00
parent 1443a165db
commit 1f2a378de4
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,6 @@
#include "catalog/pg_collation.h" #include "catalog/pg_collation.h"
#include "catalog/pg_control.h" #include "catalog/pg_control.h"
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#include "utils/builtins.h"
#include "utils/hsearch.h" #include "utils/hsearch.h"
#include "utils/memutils.h" #include "utils/memutils.h"
#include "utils/pg_locale.h" #include "utils/pg_locale.h"
@ -149,7 +148,6 @@ pg_perm_setlocale(int category, const char *locale)
char *result; char *result;
const char *envvar; const char *envvar;
char *envbuf; char *envbuf;
char orig_result[LC_ENV_BUFSIZE];
#ifndef WIN32 #ifndef WIN32
result = setlocale(category, locale); result = setlocale(category, locale);
@ -175,7 +173,6 @@ pg_perm_setlocale(int category, const char *locale)
if (result == NULL) if (result == NULL)
return result; /* fall out immediately on failure */ return result; /* fall out immediately on failure */
strlcpy(orig_result, result, sizeof(orig_result));
/* /*
* Use the right encoding in translated messages. Under ENABLE_NLS, let * Use the right encoding in translated messages. Under ENABLE_NLS, let
@ -234,17 +231,6 @@ pg_perm_setlocale(int category, const char *locale)
} }
snprintf(envbuf, LC_ENV_BUFSIZE - 1, "%s=%s", envvar, result); snprintf(envbuf, LC_ENV_BUFSIZE - 1, "%s=%s", envvar, result);
if (strcmp(orig_result, result) != 0)
{
char hex[2 * LC_ENV_BUFSIZE + 1];
unsigned hexlen;
hexlen =
hex_encode(result, Min(1 + strlen(result), LC_ENV_BUFSIZE), hex);
hex[hexlen] = '\0';
elog(FATAL, "setlocale() result %s clobbered to 0x%s",
orig_result, hex);
}
if (putenv(envbuf)) if (putenv(envbuf))
return NULL; return NULL;