diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-03-05 05:33:19 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-03-05 05:33:19 +0000 |
| commit | a643385eafb215220a560ef6e81e0ce8c41ff8a8 (patch) | |
| tree | eca04997e428af60f399bb992ef4ac49e886d372 | |
| parent | 53bbc47c2b3c293504a8d66575f47add8683d957 (diff) | |
| download | postgresql-a643385eafb215220a560ef6e81e0ce8c41ff8a8.tar.gz postgresql-a643385eafb215220a560ef6e81e0ce8c41ff8a8.zip | |
Check for "msys" so it doesn't use 'con' by checking for an evironment
variable.
| -rw-r--r-- | src/include/port.h | 4 | ||||
| -rw-r--r-- | src/port/sprompt.c | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/include/port.h b/src/include/port.h index b8ddd38f9f3..c163a3902e2 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.84.2.4 2006/03/04 04:30:51 momjian Exp $ + * $PostgreSQL: pgsql/src/include/port.h,v 1.84.2.5 2006/03/05 05:33:19 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" diff --git a/src/port/sprompt.c b/src/port/sprompt.c index 98b712bda2e..9ba5cafe0c8 100644 --- a/src/port/sprompt.c +++ b/src/port/sprompt.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/sprompt.c,v 1.12.2.2 2006/03/04 04:30:51 momjian Exp $ + * $PostgreSQL: pgsql/src/port/sprompt.c,v 1.12.2.3 2006/03/05 05:33:19 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); |