database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-21 00:42:43 +03:00
Code Activity

Tell gettext which codeset to use by calling bind_textdomain_codeset(). We

Browse Source 
already did that on Windows, but it's needed on other platforms too when
LC_CTYPE=C. With other locales, we enforce (or trust) that the codeset of
the locale matches the server encoding so we don't need to bind it
explicitly. It should do no harm in that case either, but I don't have
full faith in the PG encoding -> OS codeset mapping table yet. Per recent
discussion on pgsql-hackers.
This commit is contained in:
Heikki Linnakangas
2009-04-08 09:50:48 +00:00
parent baf048d7d2
commit 1fe5020558
4 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
*
* Tatsuo Ishii
*
* $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.84 2009/04/06 19:34:52 petere Exp $
* $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.85 2009/04/08 09:50:48 heikki Exp $
*/
#include "postgres.h"
@@ -890,7 +890,7 @@ cliplen(const char *str, int len, int limit)
return l;
}
#if defined(ENABLE_NLS) && defined(WIN32)
#if defined(ENABLE_NLS)
static const struct codeset_map {
int encoding;
const char *codeset;
@@ -929,7 +929,7 @@ static const struct codeset_map {
{PG_EUC_TW, "EUC-TW"},
{PG_EUC_JIS_2004, "EUC-JP"}
};
#endif /* WIN32 */
#endif /* ENABLE_NLS */
void
SetDatabaseEncoding(int encoding)
@@ -939,22 +939,36 @@ SetDatabaseEncoding(int encoding)
DatabaseEncoding = &pg_enc2name_tbl[encoding];
Assert(DatabaseEncoding->encoding == encoding);
#ifdef ENABLE_NLS
pg_bind_textdomain_codeset(textdomain(NULL), encoding);
#endif
}
/*
* On Windows, we need to explicitly bind gettext to the correct
* encoding, because gettext() tends to get confused.
* Bind gettext to the codeset equivalent with the database encoding.
*/
void
pg_bind_textdomain_codeset(const char *domainname, int encoding)
pg_bind_textdomain_codeset(const char *domainname)
{
#if defined(ENABLE_NLS) && defined(WIN32)
#if defined(ENABLE_NLS)
int encoding = GetDatabaseEncoding();
int i;
/*
* gettext() uses the codeset specified by LC_CTYPE by default,
* so if that matches the database encoding we don't need to do
* anything. In CREATE DATABASE, we enforce or trust that the
* locale's codeset matches database encoding, except for the C
* locale. In C locale, we bind gettext() explicitly to the right
* codeset.
*
* On Windows, though, gettext() tends to get confused so we always
* bind it.
*/
#ifndef WIN32
const char *ctype = setlocale(LC_CTYPE, NULL);
if (pg_strcasecmp(ctype, "C") != 0 && pg_strcasecmp(ctype, "POSIX") != 0)
return;
#endif
for (i = 0; i < lengthof(codeset_map_array); i++)
{
if (codeset_map_array[i].encoding == encoding)