From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 5 Mar 2006 05:33:47 +0000 (+0000)
Subject: Check for "msys" so it doesn't use 'con' by checking for an evironment
X-Git-Tag: REL8_0_8~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3923f08ca03889d3e6d818085538cedbb388a140;p=thirdparty%2Fpostgresql.git

Check for "msys" so it doesn't use 'con' by checking for an evironment
variable.
---

diff --git a/src/include/port.h b/src/include/port.h
index e237f09f742..4c306900a75 100644
--- 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.3 2006/03/04 04:31:05 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/port.h,v 1.69.4.4 2006/03/05 05:33:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -80,7 +80,7 @@ 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. */
+/* "con" does not work from the Msys 1.0.10 console (part of MinGW). */
 #define DEVTTY	"con"
 #else
 #define DEVNULL "/dev/null"
diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index 5a20a4ed7d3..534d6e4655a 100644
--- 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.2 2006/03/04 04:31:05 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/sprompt.c,v 1.10.4.3 2006/03/05 05:33:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,7 +66,12 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
 	 */
 	termin = fopen(DEVTTY, "r");
 	termout = fopen(DEVTTY, "w");
-	if (!termin || !termout)
+	if (!termin || !termout
+#ifdef WIN32
+		/* See DEVTTY comment for msys */
+		|| (getenv("OSTYPE") && strcmp(getenv("OSTYPE"), "msys") == 0)
+#endif
+		)
 	{
 		if (termin)
 			fclose(termin);