Commit64e7c8a

committed

Use DEVTTY as 'con' on Win32 as a replacement for /dev/tty.

1 parent26d6054 commit64e7c8aCopy full SHA for 64e7c8a

File tree

+11

-18

lines changed

+11

-18

lines changed

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.162 2006/03/03 23:49:12 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.163 2006/03/04 04:30:40 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"command.h"`
`@@ -753,11 +753,7 @@ exec_command(const char *cmd,`
`753`	`753`
`754`	`754`	`expand_tilde(&fname);`
`755`	`755`	`/* This scrolls off the screen when using /dev/tty */`
`756`		`-#ifndefWIN32`
`757`		`-success=saveHistory(fname ?fname :"/dev/tty");`
`758`		`-#else`
`759`		`-success=saveHistory(fname ?fname :stderr);`
`760`		`-#endif`
	`756`	`+success=saveHistory(fname ?fname :DEVTTY);`
`761`	`757`	`if (success&& !quiet&&fname)`
`762`	`758`	`printf(gettext("Wrote history to file \"%s/%s\".\n"),`
`763`	`759`	`pset.dirname ?pset.dirname :".",fname);`

Lines changed: 4 additions & 1 deletion

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.87 2005/12/06 18:35:10 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/port.h,v 1.88 2006/03/04 04:30:40 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -84,8 +84,11 @@ 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 the MinGW 1.0.10 console. */`
	`88`	`+#defineDEVTTY"con"`
`87`	`89`	`#else`
`88`	`90`	`#defineDEVNULL "/dev/null"`
	`91`	`+#defineDEVTTY "/dev/tty"`
`89`	`92`	`#endif`
`90`	`93`
`91`	`94`	`/*`

Lines changed: 5 additions & 11 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.13 2006/03/03 23:49:12 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/port/sprompt.c,v 1.14 2006/03/04 04:30:41 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -40,8 +40,8 @@ simple_prompt(const char *prompt, int maxlen, bool echo)`
`40`	`40`	`{`
`41`	`41`	`intlength;`
`42`	`42`	`char*destination;`
`43`		`-FILE*termin=NULL,`
`44`		`-*termout=NULL;`
	`43`	`+FILE*termin,`
	`44`	`+*termout;`
`45`	`45`
`46`	`46`	`#ifdefHAVE_TERMIOS_H`
`47`	`47`	`structtermiost_orig,`
`@@ -63,14 +63,8 @@ simple_prompt(const char *prompt, int maxlen, bool echo)`
`63`	`63`	`* Do not try to collapse these into one "w+" mode file. Doesn't work on`
`64`	`64`	`* some platforms (eg, HPUX 10.20).`
`65`	`65`	`*/`
`66`		`-#ifndefWIN32`
`67`		`-/*`
`68`		`- *Some win32 platforms actually have a /dev/tty file, but it isn't`
`69`		`- *a device file, and it doesn't work as expected, so we avoid trying.`
`70`		`- */`
`71`		`-termin=fopen("/dev/tty","r");`
`72`		`-termout=fopen("/dev/tty","w");`
`73`		`-#endif`
	`66`	`+termin=fopen(DEVTTY,"r");`
	`67`	`+termout=fopen(DEVTTY,"w");`
`74`	`68`	`if (!termin\|\| !termout)`
`75`	`69`	`{`
`76`	`70`	`if (termin)`

Comments

(0)