From cb8d423edb39f88cb5c76dc41ec63a732b17576c Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 12 Sep 2003 02:46:03 +0000 Subject: [PATCH] Remove WIN32 console. --- doc/src/sgml/ref/psql-ref.sgml | 15 +-------------- src/bin/psql/input.c | 11 +---------- src/bin/psql/mbprint.c | 11 +---------- src/bin/scripts/Makefile | 4 ++-- 4 files changed, 5 insertions(+), 36 deletions(-) diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 251f67fa5cd..d0678e1920b 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1,5 +1,5 @@ @@ -2073,19 +2073,6 @@ bar - - WIN32_CONSOLE - - - This variable is only useful when working under the Win32 command - console. As the Win32 command console uses a different encoding than - the rest of the Windows system. Eight-bit characters (e.g. German Umlauts) - are corrupted. When this variable is set the command console encoding will - be translated into ASCII encoding for input and output. - - - - 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 diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index 16acd2029bc..3c3a78ce386 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.22.2.1 2003/09/07 04:37:04 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.22.2.2 2003/09/12 02:46:03 momjian Exp $ # #------------------------------------------------------------------------- @@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb -override CPPFLAGS := -DPGSCRIPTS -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS) +override CPPFLAGS := -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS) all: submake-libpq submake-backend $(PROGRAMS)