database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

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

Browse Source 
variable.
This commit is contained in:
Bruce Momjian 2006-03-05 05:33:19 +00:00
parent 53bbc47c2b
commit a643385eaf
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/port.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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__) #if defined(WIN32) && !defined(__CYGWIN__)
#define DEVNULL "nul" #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" #define DEVTTY "con"
#else #else
#define DEVNULL "/dev/null" #define DEVNULL "/dev/null"

9
src/port/sprompt.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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"); termin = fopen(DEVTTY, "r");
termout = fopen(DEVTTY, "w"); 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) if (termin)
fclose(termin); fclose(termin);