From 2b919118c2511c7741c21f325d2ca4f270aa3aba Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 20 Apr 2011 09:49:44 +0300 Subject: [PATCH] Quotes in strings injected into bki file need to escaped. In particular, "People's Republic of China" locale on Windows was causing initdb to fail. This fixes bug #5818 reported by yulei. On master, this makes the mapping of "People's Republic of China" to just "China" obsolete. In 9.0 and 8.4, just fix the escaping. Earlier versions didn't have locale names in bki file. --- src/bin/initdb/initdb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index f424112890..d26ff63e1d 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -1165,9 +1165,9 @@ bootstrap_template1(void) bki_lines = replace_token(bki_lines, "ENCODING", encodingid); - bki_lines = replace_token(bki_lines, "LC_COLLATE", lc_collate); + bki_lines = replace_token(bki_lines, "LC_COLLATE", escape_quotes(lc_collate)); - bki_lines = replace_token(bki_lines, "LC_CTYPE", lc_ctype); + bki_lines = replace_token(bki_lines, "LC_CTYPE", escape_quotes(lc_ctype)); /* * Pass correct LC_xxx environment to bootstrap. @@ -2276,8 +2276,8 @@ strreplace(char *str, char *needle, char *replacement) #endif /* WIN32 */ /* - * Windows has a problem with locale names that have a dot or apostrophe in - * the country name. For example: + * Windows has a problem with locale names that have a dot in the country + * name. For example: * * "Chinese (Traditional)_Hong Kong S.A.R..950" * @@ -2295,15 +2295,15 @@ localemap(char *locale) #ifdef WIN32 /* - * Map the full country name to an abbreviation that setlocale() accepts - * "China" and "HKG" are listed here: + * Map the full country name to an abbreviation that setlocale() accepts. + * + * "HKG" is listed here: * http://msdn.microsoft.com/en-us/library/cdax410z%28v=vs.71%29.aspx * (Country/Region Strings). * * "ARE" is the ISO-3166 three-letter code for U.A.E. It is not on the * above list, but seems to work anyway. */ - strreplace(locale, "People's Republic of China", "China"); strreplace(locale, "Hong Kong S.A.R.", "HKG"); strreplace(locale, "U.A.E.", "ARE"); -- 2.11.0