Commit 834f4501 authored by Tom Lane's avatar Tom Lane

Tweak initdb's text search configuration selection code so it can

cope with LANG settings like 'es_ES@euro'.
parent c0a82760
......@@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD.
*
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.141 2007/09/25 16:29:34 petere Exp $
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.142 2007/09/28 15:25:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -971,7 +971,7 @@ find_matching_ts_config(const char *lc_type)
*ptr;
/*
* Convert lc_ctype to a language name by stripping ".utf8" or
* Convert lc_ctype to a language name by stripping ".utf8", "@euro", or
* what-have-you
*/
if (lc_type == NULL)
......@@ -979,7 +979,7 @@ find_matching_ts_config(const char *lc_type)
else
{
ptr = langname = xstrdup(lc_type);
while (*ptr && *ptr != '.')
while (*ptr && *ptr != '.' && *ptr != '@')
ptr++;
*ptr = '\0';
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment