Clean up WIN32_CONSOLE code.

bmomjian · bmomjian · commit 04aabb034fe9 · 2003-09-05T02:31:10.000Z
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.29 2003/08/26 18:35:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.30 2003/09/05 02:31:10 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "input.h"
@@ -45,16 +45,6 @@ static void finishInput(int, void *);
 #define PSQLHISTORY ".psql_history"
 
 
-#ifdef WIN32
-
- /*
-  * translate DOS console character set into ANSI, needed e.g. for German
-  * umlauts
-  */
-if (GetVariableBool(pset.vars, "WIN32_CONSOLE"))
-	OemToChar(s, s);
-#endif
-
 #ifdef USE_READLINE
 static enum histcontrol
 GetHistControlConfig(void)
@@ -109,6 +99,15 @@ gets_interactive(const char *prompt)
 	else
 		s = gets_basic(prompt);
 
+#ifdef WIN32
+	 /*
+	  * translate DOS console character set into ANSI, needed e.g. for German
+	  * umlauts
+	  */
+	if (GetVariableBool(pset.vars, "WIN32_CONSOLE"))
+		OemToChar(s, s);
+#endif
+
 	if (useHistory && s && s[0])
 	{
 		enum histcontrol HC;
diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.9 2003/08/04 23:59:40 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.10 2003/09/05 02:31:10 momjian Exp $
  */
 
 #include "postgres_fe.h"
@@ -335,7 +335,6 @@ mbvalidate(unsigned char *pwcs, int encoding)
 	else
 	{
 #ifdef WIN32
-
 		/*
 		 * translate characters to DOS console encoding, e.g. needed for
 		 * German umlauts

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2003, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.9 2003/08/04 23:59:40 tgl Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.10 2003/09/05 02:31:10 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`#include "postgres_fe.h"`
`@@ -335,7 +335,6 @@ mbvalidate(unsigned char *pwcs, int encoding)`
`335`	`335`	`else`
`336`	`336`	`{`
`337`	`337`	`#ifdef WIN32`
`338`		`-`
`339`	`338`	`/*`
`340`	`339`	`* translate characters to DOS console encoding, e.g. needed for`
`341`	`340`	`* German umlauts`