Use DEVTTY as 'con' on Win32 as a replacement for /dev/tty.

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index a55e468fe0101e534dc352acfe0ba4139167015c..783ef0e0a07058f640b9646e69dea56114292022 100644 (file)
--- 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.139.4.2 2006/03/03 23:54:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.139.4.3 2006/03/04 04:31:05 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -654,12 +654,7 @@ 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
-
+               success = saveHistory(fname ? fname : DEVTTY);
                if (success && !quiet && fname)
                        printf(gettext("Wrote history to file \"%s\".\n"), fname);
                if (!fname)

diff --git a/src/include/port.h b/src/include/port.h
index efe42c64df831bb70fd2cb34540c1c5530f40885..e237f09f74275c59b582765c9fff0c5b734eb60a 100644 (file)
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/port.h,v 1.69.4.2 2005/03/25 00:35:15 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/port.h,v 1.69.4.3 2006/03/04 04:31:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -80,8 +80,11 @@ extern int find_other_exec(const char *argv0, const char *target,
 
 #if defined(WIN32) && !defined(__CYGWIN__)
 #define DEVNULL "nul"
+/* "con" does not work from the MinGW 1.0.10 console. */
+#define DEVTTY "con"
 #else
 #define DEVNULL "/dev/null"
+#define DEVTTY "/dev/tty"
 #endif
 
 /*

diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index 4b751d8579c7f5aef10fd2c9b8d31163310f9a9c..5a20a4ed7d3ee238f3a3cc09d5927687e3a478c2 100644 (file)
--- a/src/port/sprompt.c
+++ b/src/port/sprompt.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/port/sprompt.c,v 1.10.4.1 2006/03/03 23:54:52 momjian Exp $
+ *       $PostgreSQL: pgsql/src/port/sprompt.c,v 1.10.4.2 2006/03/04 04:31:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,8 +40,8 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
 {
        int                     length;
        char       *destination;
-       FILE       *termin = NULL,
-                          *termout = NULL;
+       FILE       *termin,
+                          *termout;
 
 #ifdef HAVE_TERMIOS_H
        struct termios t_orig,
@@ -64,14 +64,8 @@ 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
+       termin = fopen(DEVTTY, "r");
+       termout = fopen(DEVTTY, "w");
        if (!termin || !termout)
        {
                if (termin)