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

cope with LANG settings like 'es_ES@euro'.

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 134c703c4688effcfc7b4386d11beaed95a87caf..52f50f195b76b2b3d01ba3cf39e98a1571b00c6f 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -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';
    }