On WIN32, don't choke when setlocale(LC_MESSAGES, "") returns NULL.

tglsfdc · tglsfdc · commit d7013b0f1583 · 2004-05-27T19:19:05.000Z
Per report from Magnus.
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 2002-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/pg_locale.c,v 1.25 2004/01/19 19:04:40 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/pg_locale.c,v 1.26 2004/05/27 19:19:05 tgl Exp $
  *
  *-----------------------------------------------------------------------
  */
@@ -131,11 +131,22 @@ locale_messages_assign(const char *value, bool doit, GucSource source)
 	if (doit)
 	{
 		if (!setlocale(LC_MESSAGES, value))
+		{
+#ifdef WIN32
+			/*
+			 * Win32 returns NULL when you set LC_MESSAGES to "".  So don't
+			 * complain unless we're trying to set it to something else.
+			 */
+			if (value[0])
+				return NULL;
+#else
 			return NULL;
+#endif
+		}
 	}
 	else
 		value = locale_xxx_assign(LC_MESSAGES, value, false, source);
-#endif
+#endif /* LC_MESSAGES */
 	return value;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 2002-2003, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/pg_locale.c,v 1.25 2004/01/19 19:04:40 tgl Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/pg_locale.c,v 1.26 2004/05/27 19:19:05 tgl Exp $`
`8`	`8`	`*`
`9`	`9`	`*-----------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -131,11 +131,22 @@ locale_messages_assign(const char *value, bool doit, GucSource source)`
`131`	`131`	`if (doit)`
`132`	`132`	`{`
`133`	`133`	`if (!setlocale(LC_MESSAGES, value))`
	`134`	`+ {`
	`135`	`+#ifdef WIN32`
	`136`	`+ /*`
	`137`	`+ * Win32 returns NULL when you set LC_MESSAGES to "". So don't`
	`138`	`+ * complain unless we're trying to set it to something else.`
	`139`	`+ */`
	`140`	`+ if (value[0])`
	`141`	`+ return NULL;`
	`142`	`+#else`
`134`	`143`	`return NULL;`
	`144`	`+#endif`
	`145`	`+ }`
`135`	`146`	`}`
`136`	`147`	`else`
`137`	`148`	`value = locale_xxx_assign(LC_MESSAGES, value, false, source);`
`138`		`-#endif`
	`149`	`+#endif /* LC_MESSAGES */`
`139`	`150`	`return value;`
`140`	`151`	`}`
`141`	`152`