summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2006-03-03 23:49:21 +0000
committerBruce Momjian2006-03-03 23:49:21 +0000
commit75e721cd658e6286b17b450fc5fe00d836ca18cf (patch)
tree0be5114a2cbf11096dd4a45449d202d933ca498c
parent09028b1927bd070d1713adc513ceee09b11e162f (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
-rw-r--r--src/bin/psql/command.c5
-rw-r--r--src/port/sprompt.c10
2 files changed, 12 insertions, 3 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index dd2ca4f48c..da84657fec 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -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);
diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index 79a8b7528f..2211f813ef 100644
--- a/src/port/sprompt.c
+++ b/src/port/sprompt.c
@@ -40,8 +40,8 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
{
int length;
char *destination;
- FILE *termin,
- *termout;
+ FILE *termin = NULL,
+ *termout = NULL;
#ifdef HAVE_TERMIOS_H
struct termios t_orig,
@@ -63,8 +63,14 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
* Do not try to collapse these into one "w+" mode file. Doesn't work on
* some platforms (eg, HPUX 10.20).
*/
+#ifndef WIN32
+ /*
+ * Some win32 platforms actually have a /dev/tty file, but it isn't
+ * a device file, and it doesn't work as expected, so we avoid trying.
+ */
termin = fopen("/dev/tty", "r");
termout = fopen("/dev/tty", "w");
+#endif
if (!termin || !termout)
{
if (termin)