Commita4a6ee4

committed

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

variable.

1 parent5fde861 commita4a6ee4Copy full SHA for a4a6ee4

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/port.h,v 1.88 2006/03/04 04:30:40 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/port.h,v 1.89 2006/03/05 05:33:12 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -84,7 +84,7 @@ extern int find_other_exec(const char argv0, const char target,`
`84`	`84`
`85`	`85`	`#if defined(WIN32)&& !defined(__CYGWIN__)`
`86`	`86`	`#defineDEVNULL "nul"`
`87`		`-/* "con" does not work from theMinGW 1.0.10 console. */`
	`87`	`+/* "con" does not work from theMsys 1.0.10 console (part of MinGW). */`
`88`	`88`	`#defineDEVTTY"con"`
`89`	`89`	`#else`
`90`	`90`	`#defineDEVNULL "/dev/null"`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/port/sprompt.c,v 1.14 2006/03/04 04:30:41 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/port/sprompt.c,v 1.15 2006/03/05 05:33:12 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -65,7 +65,12 @@ simple_prompt(const char *prompt, int maxlen, bool echo)`
`65`	`65`	`*/`
`66`	`66`	`termin=fopen(DEVTTY,"r");`
`67`	`67`	`termout=fopen(DEVTTY,"w");`
`68`		`-if (!termin\|\| !termout)`
	`68`	`+if (!termin\|\| !termout`
	`69`	`+#ifdefWIN32`
	`70`	`+/* See DEVTTY comment for msys */`
	`71`	`+\|\| (getenv("OSTYPE")&&strcmp(getenv("OSTYPE"),"msys")==0)`
	`72`	`+#endif`
	`73`	`+)`
`69`	`74`	`{`
`70`	`75`	`if (termin)`
`71`	`76`	`fclose(termin);`

Comments

(0)