Commit834f450

committed

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

cope with LANG settings like 'es_ES@euro'.

1 parentc0a8276 commit834f450Copy full SHA for 834f450

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`* Portions Copyright (c) 1994, Regents of the University of California`
`43`	`43`	`* Portions taken from FreeBSD.`
`44`	`44`	`*`
`45`		`- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.141 2007/09/25 16:29:34 petere Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.142 2007/09/28 15:25:44 tgl Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -971,15 +971,15 @@ find_matching_ts_config(const char *lc_type)`
`971`	`971`	`*ptr;`
`972`	`972`
`973`	`973`	`/*`
`974`		`- * Convert lc_ctype to a language name by stripping ".utf8" or`
	`974`	`+ * Convert lc_ctype to a language name by stripping ".utf8", "@euro", or`
`975`	`975`	`* what-have-you`
`976`	`976`	`*/`
`977`	`977`	`if (lc_type==NULL)`
`978`	`978`	`langname=xstrdup("");`
`979`	`979`	`else`
`980`	`980`	`{`
`981`	`981`	`ptr=langname=xstrdup(lc_type);`
`982`		`-while (ptr&&ptr!='.')`
	`982`	`+while (ptr&&ptr!='.'&&*ptr!='@')`
`983`	`983`	`ptr++;`
`984`	`984`	`*ptr='\0';`
`985`	`985`	`}`

Comments

(0)