aboutsummaryrefslogtreecommitdiff
path: root/src/bin/psql/command.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2006-03-03 23:49:12 +0000
committerBruce Momjian <bruce@momjian.us>2006-03-03 23:49:12 +0000
commitef3f7c3f74961883c355a6e7ec9ee67d52d92eef (patch)
treeaf046f03cbbdd4fba176cccdc428415dc741b689 /src/bin/psql/command.c
parentdecdaf3592dfa05642373a7bffcb431e45cc5aac (diff)
downloadpostgresql-ef3f7c3f74961883c355a6e7ec9ee67d52d92eef.tar.gz
postgresql-ef3f7c3f74961883c355a6e7ec9ee67d52d92eef.zip
Avoid trying to open /dev/tty on Win32. Some Win32 systems have
/dev/tty, but it isn't a device file and doesn't work as expected. This fixes a known bug where psql does not prompt for a password on some Win32 systems. Backpatch to 8.1.X. Robert Kinberg
Diffstat (limited to 'src/bin/psql/command.c')
-rw-r--r--src/bin/psql/command.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 82770218593..2ff454c8427 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2005, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.161 2006/02/12 04:04:32 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.162 2006/03/03 23:49:12 momjian Exp $
*/
#include "postgres_fe.h"
#include "command.h"
@@ -753,8 +753,11 @@ exec_command(const char *cmd,
expand_tilde(&fname);
/* This scrolls off the screen when using /dev/tty */
+#ifndef WIN32
success = saveHistory(fname ? fname : "/dev/tty");
-
+#else
+ success = saveHistory(fname ? fname : stderr);
+#endif
if (success && !quiet && fname)
printf(gettext("Wrote history to file \"%s/%s\".\n"),
pset.dirname ? pset.dirname : ".", fname);