summaryrefslogtreecommitdiff
path: root/src/bin/psql
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/psql')
-rw-r--r--src/bin/psql/input.c11
-rw-r--r--src/bin/psql/mbprint.c11
2 files changed, 2 insertions, 20 deletions
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 91fa5918249..58ef6ce387c 100644
--- 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.28.2.1 2003/09/07 04:37:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.28.2.2 2003/09/12 02:46:03 momjian Exp $
*/
#include "postgres_fe.h"
#include "input.h"
@@ -99,15 +99,6 @@ 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
index a44ca6c9073..18723aaef1f 100644
--- 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.2.1 2003/09/07 04:37:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.9.2.2 2003/09/12 02:46:03 momjian Exp $
*/
#include "postgres_fe.h"
@@ -337,15 +337,6 @@ mbvalidate(unsigned char *pwcs, int encoding)
return mb_utf_validate(pwcs);
else
{
-#if defined(WIN32) && !defined(PGSCRIPTS)
- /*
- * translate characters to DOS console encoding, e.g. needed for
- * German umlauts
- */
- if (GetVariableBool(pset.vars, "WIN32_CONSOLE"))
- CharToOem(pwcs, pwcs);
-#endif
-
/*
* other encodings needing validation should add their own
* routines here