mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up WIN32_CONSOLE code.

This commit is contained in:
Bruce Momjian 2003-09-05 02:31:10 +00:00
parent 248af40d6d
commit 04aabb034f
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/bin/psql/input.c
View File

@ -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;

3
src/bin/psql/mbprint.c
View File

@ -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