diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-03-03 23:49:21 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-03-03 23:49:21 +0000 |
| commit | e57415c507a9762ed86938f39a00c6e9b607e9b7 (patch) | |
| tree | 9865501c196631e7ae1e9bf37606c60bd3f18d08 /src/bin/psql/command.c | |
| parent | 69c539b535546be59a5928f06139fe05dda86316 (diff) | |
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.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 40081d0adf0..b06e1db6175 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.154.2.1 2005/12/08 21:17:46 petere Exp $ + * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.154.2.2 2006/03/03 23:49:21 momjian Exp $ */ #include "postgres_fe.h" #include "command.h" @@ -659,8 +659,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); |