Skip to content
Snippets Groups Projects
Commit a4a6ee4a authored by Bruce Momjian's avatar Bruce Momjian
Browse files

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

variable.
parent 5fde8613
No related branches found
No related tags found
No related merge requests found
......@@ -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.88 2006/03/04 04:30:40 momjian Exp $
* $PostgreSQL: pgsql/src/include/port.h,v 1.89 2006/03/05 05:33:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -84,7 +84,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"
......
......@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/port/sprompt.c,v 1.14 2006/03/04 04:30:41 momjian Exp $
* $PostgreSQL: pgsql/src/port/sprompt.c,v 1.15 2006/03/05 05:33:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -65,7 +65,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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment