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

tglsfdc · tglsfdc · commit 834f45014bd9 · 2007-09-28T15:25:44.000Z
cope with LANG settings like 'es_ES@euro'.
diff --git 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,15 +971,15 @@ 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)
 		langname = xstrdup("");
 	else
 	{
 		ptr = langname = xstrdup(lc_type);
-		while (*ptr && *ptr != '.')
+		while (*ptr && *ptr != '.' && *ptr != '@')
 			ptr++;
 		*ptr = '\0';
 	}
