summaryrefslogtreecommitdiff
path: root/src/bin/psql/startup.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2003-03-18 22:15:44 +0000
committerPeter Eisentraut <peter_e@gmx.net>2003-03-18 22:15:44 +0000
commitcf1cf8964925cd36dc7bf034a968a4e44ede382a (patch)
treef80bcdd31d3af6f1783ea382e277130db22d6093 /src/bin/psql/startup.c
parent9384dc6e597baf53d3aa07343163ec7011e6181a (diff)
Make the printing code somewhat more independent by not relying on
functions and global variables from the rest of psql. Also clean up some data type mismatches created by the last pager patch.
Diffstat (limited to 'src/bin/psql/startup.c')
-rw-r--r--src/bin/psql/startup.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 28bbf3cc5e1..39c22dfc69a 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.70 2003/01/06 18:53:25 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.71 2003/03/18 22:15:44 petere Exp $
*/
#include "postgres_fe.h"
@@ -231,6 +231,8 @@ main(int argc, char *argv[])
SetVariable(pset.vars, "PORT", PQport(pset.db));
SetVariable(pset.vars, "ENCODING", pg_encoding_to_char(pset.encoding));
+ pset.popt.topt.encoding = pset.encoding;
+
/*
* Now find something to do
*/