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

Make use of additional chklocale.c entries to reject locales that we

Browse Source 
cannot support.
This commit is contained in:
Tom Lane 2007-09-29 00:14:40 +00:00
parent d5459671a3
commit b37e1770c5
1 changed files with 14 additions and 1 deletions

15
src/bin/initdb/initdb.c

@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * Portions taken from FreeBSD.
* *
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.143 2007/09/28 22:25:49 tgl Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.144 2007/09/29 00:14:40 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2800,6 +2800,7 @@ main(int argc, char *argv[])
!(pg_strcasecmp(lc_ctype, "C") == 0 || !(pg_strcasecmp(lc_ctype, "C") == 0 ||
pg_strcasecmp(lc_ctype, "POSIX") == 0)) pg_strcasecmp(lc_ctype, "POSIX") == 0))
{ {
/* Hmm, couldn't recognize the locale's codeset */
fprintf(stderr, _("%s: could not find suitable encoding for locale \"%s\"\n"), fprintf(stderr, _("%s: could not find suitable encoding for locale \"%s\"\n"),
progname, lc_ctype); progname, lc_ctype);
fprintf(stderr, _("Rerun %s with the -E option.\n"), progname); fprintf(stderr, _("Rerun %s with the -E option.\n"), progname);
@ -2807,6 +2808,18 @@ main(int argc, char *argv[])
progname); progname);
exit(1); exit(1);
} }
else if (!PG_VALID_BE_ENCODING(ctype_enc))
{
/* We recognized it, but it's not a legal server encoding */
fprintf(stderr,
_("%s: locale %s requires unsupported encoding %s\n"),
progname, lc_ctype, pg_encoding_to_char(ctype_enc));
fprintf(stderr,
_("Encoding %s is not allowed as a server-side encoding.\n"
"Rerun %s with a different locale selection.\n"),
pg_encoding_to_char(ctype_enc), progname);
exit(1);
}
else else
{ {
encodingid = encodingid_to_string(ctype_enc); encodingid = encodingid_to_string(ctype_enc);