mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-01 19:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly bind gettext() to the UTF8 locale when in use.

Browse Source 
This is required on Windows due to the special locale
handling for UTF8 that doesn't change the full environment.

Fixes crash with translated error messages per bugs 4180
and 4196.

Tom Lane
This commit is contained in:
Magnus Hagander 2008-05-27 12:24:46 +00:00
parent ed91252bc2
commit 4bdc742231
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/backend/utils/mb/mbutils.c
View File

@ -4,7 +4,7 @@
* (currently mule internal code (mic) is used)
* Tatsuo Ishii
*
* $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.69 2008/01/09 23:43:54 tgl Exp $
* $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.69.2.1 2008/05/27 12:24:46 mha Exp $
*/
#include "postgres.h"
@ -697,6 +697,25 @@ SetDatabaseEncoding(int encoding)
DatabaseEncoding = &pg_enc2name_tbl[encoding];
Assert(DatabaseEncoding->encoding == encoding);
/*
* On Windows, we allow UTF-8 database encoding to be used with any
* locale setting, because UTF-8 requires special handling anyway.
* But this means that gettext() might be misled about what output
* encoding it should use, so we have to tell it explicitly.
*
* In future we might want to call bind_textdomain_codeset
* unconditionally, but that requires knowing how to spell the codeset
* name properly for all encodings on all platforms, which might be
* problematic.
*
* This is presently unnecessary, but harmless, on non-Windows platforms.
*/
#ifdef ENABLE_NLS
if (encoding == PG_UTF8)
if (bind_textdomain_codeset("postgres", "UTF-8") == NULL)
elog(LOG, "bind_textdomain_codeset failed");
#endif
}
void