*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.172 2009/01/05 13:57:12 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.173 2009/03/08 16:07:12 alvherre Exp $
*
*-------------------------------------------------------------------------
*/
#endif
#include "catalog/pg_authid.h"
+#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "postmaster/autovacuum.h"
#include "storage/fd.h"
get_locale_path(my_exec_path, locale_path);
bindtextdomain(domain, locale_path);
+ pg_bind_textdomain_codeset(domain, GetDatabaseEncoding());
}
#endif
}
* (currently mule internal code (mic) is used)
* Tatsuo Ishii
*
- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.79 2009/03/02 15:10:09 teodor Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.80 2009/03/08 16:07:12 alvherre Exp $
*/
#include "postgres.h"
DatabaseEncoding = &pg_enc2name_tbl[encoding];
Assert(DatabaseEncoding->encoding == encoding);
- /*
- * On Windows, we need to explicitly bind gettext to the correct
- * encoding, because gettext() tends to get confused.
- */
+ pg_bind_textdomain_codeset(textdomain(NULL), encoding);
+}
+
+/*
+ * On Windows, we need to explicitly bind gettext to the correct
+ * encoding, because gettext() tends to get confused.
+ */
+void
+pg_bind_textdomain_codeset(const char *domainname, int encoding)
+{
#if defined(ENABLE_NLS) && defined(WIN32)
- {
- int i;
+ int i;
- for (i = 0; i < sizeof(codeset_map_array) / sizeof(codeset_map_array[0]); i++)
+ for (i = 0; i < lengthof(codeset_map_array); i++)
+ {
+ if (codeset_map_array[i].encoding == encoding)
{
- if (codeset_map_array[i].encoding == encoding)
- {
- if (bind_textdomain_codeset(textdomain(NULL), codeset_map_array[i].codeset) == NULL)
- elog(LOG, "bind_textdomain_codeset failed");
- break;
- }
+ if (bind_textdomain_codeset(domainname,
+ codeset_map_array[i].codeset) == NULL)
+ elog(LOG, "bind_textdomain_codeset failed");
+ break;
}
}
#endif
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.84 2009/02/10 19:29:39 petere Exp $
+ * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.85 2009/03/08 16:07:12 alvherre Exp $
*
* NOTES
* This is used both by the backend and by libpq, but should not be
extern void SetDatabaseEncoding(int encoding);
extern int GetDatabaseEncoding(void);
extern const char *GetDatabaseEncodingName(void);
+extern void pg_bind_textdomain_codeset(const char *domainname, int encoding);
extern int pg_valid_client_encoding(const char *name);
extern int pg_valid_server_encoding(const char *name);