Fix whitespace

[postgresql] / src / port / sprompt.c

diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index 988626fdc398f89bfe09ad0af6be439370cc4477..c549a6f0bd87809da7dc58fbdefd6a88174e0bdd 100644 (file)
--- a/src/port/sprompt.c
+++ b/src/port/sprompt.c
@@ -3,12 +3,12 @@
  * sprompt.c
  *       simple_prompt() routine
  *
- * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/port/sprompt.c,v 1.19 2007/01/05 22:20:03 momjian Exp $
+ *       src/port/sprompt.c
  *
  *-------------------------------------------------------------------------
  */
@@ -56,15 +56,43 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
        if (!destination)
                return NULL;
 
+#ifdef WIN32
+
+       /*
+        * A Windows console has an "input code page" and an "output code page";
+        * these usually match each other, but they rarely match the "Windows ANSI
+        * code page" defined at system boot and expected of "char *" arguments to
+        * Windows API functions.  The Microsoft CRT write() implementation
+        * automatically converts text between these code pages when writing to a
+        * console.  To identify such file descriptors, it calls GetConsoleMode()
+        * on the underlying HANDLE, which in turn requires GENERIC_READ access on
+        * the HANDLE.  Opening termout in mode "w+" allows that detection to
+        * succeed.  Otherwise, write() would not recognize the descriptor as a
+        * console, and non-ASCII characters would display incorrectly.
+        *
+        * XXX fgets() still receives text in the console's input code page.  This
+        * makes non-ASCII credentials unportable.
+        */
+       termin = fopen("CONIN$", "r");
+       termout = fopen("CONOUT$", "w+");
+#else
+
        /*
         * Do not try to collapse these into one "w+" mode file. Doesn't work on
         * some platforms (eg, HPUX 10.20).
         */
-       termin = fopen(DEVTTY, "r");
-       termout = fopen(DEVTTY, "w");
+       termin = fopen("/dev/tty", "r");
+       termout = fopen("/dev/tty", "w");
+#endif
        if (!termin || !termout
 #ifdef WIN32
-       /* See DEVTTY comment for msys */
+
+       /*
+        * Direct console I/O does not work from the MSYS 1.0.10 console.  Writes
+        * reach nowhere user-visible; reads block indefinitely.  XXX This affects
+        * most Windows terminal environments, including rxvt, mintty, Cygwin
+        * xterm, Cygwin sshd, and PowerShell ISE.      Switch to a more-generic test.
+        */
                || (getenv("OSTYPE") && strcmp(getenv("OSTYPE"), "msys") == 0)
 #endif
                )