NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit50485b3

committed

Fix simple_prompt() to disable echo on Windows when stdin != terminal.

If echo = false, simple_prompt() is supposed to prevent echoing theinput (for password input). However, the Windows implementation appliedthe mode change to STD_INPUT_HANDLE. That would not have the desiredeffect if stdin isn't actually the terminal, for instance if the useris piping something into psql. Fix it to apply the mode change tothe correct input file, so that passwords do not echo in such cases.In passing, shorten and de-uglify this code by using #elif rather thanan #if nest and removing some duplicated code.Back-patch to all supported versions. To simplify that, also back-patchthe portions of commit9daec77 that got rid of an unnecessarymalloc/free in the same area.Matthew Stickney (cosmetic changes by me)Discussion:https://postgr.es/m/502a1fff-862b-da52-1031-f68df6ed5a2d@gmail.com

1 parentb929614 commit50485b3Copy full SHA for 50485b3

File tree

1 file changed

+16

-24

lines changed

src/port
- sprompt.c

1 file changed

+16

-24

lines changed

`‎src/port/sprompt.c`

Lines changed: 16 additions & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,13 @@ simple_prompt(const char prompt, char destination, size_t destlen, bool echo)`
`40`	`40`	`FILE*termin,`
`41`	`41`	`*termout;`
`42`	`42`
`43`		`-#ifdefHAVE_TERMIOS_H`
	`43`	`+#if defined(HAVE_TERMIOS_H)`
`44`	`44`	`structtermiost_orig,`
`45`	`45`	`t;`
`46`		`-#else`
`47`		`-#ifdefWIN32`
	`46`	`+#elif defined(WIN32)`
`48`	`47`	`HANDLEt=NULL;`
`49`	`48`	`DWORDt_orig=0;`
`50`	`49`	`#endif`
`51`		`-#endif`
`52`	`50`
`53`	`51`	`#ifdefWIN32`
`54`	`52`
`@@ -66,8 +64,11 @@ simple_prompt(const char prompt, char destination, size_t destlen, bool echo)`
`66`	`64`	`*`
`67`	`65`	`* XXX fgets() still receives text in the console's input code page. This`
`68`	`66`	`* makes non-ASCII credentials unportable.`
	`67`	`+ *`
	`68`	`+ * Unintuitively, we also open termin in mode "w+", even though we only`
	`69`	`+ * read it; that's needed for SetConsoleMode() to succeed.`
`69`	`70`	`*/`
`70`		`-termin=fopen("CONIN$","r");`
	`71`	`+termin=fopen("CONIN$","w+");`
`71`	`72`	`termout=fopen("CONOUT$","w+");`
`72`	`73`	`#else`
`73`	`74`
`@@ -99,29 +100,25 @@ simple_prompt(const char prompt, char destination, size_t destlen, bool echo)`
`99`	`100`	`termout=stderr;`
`100`	`101`	`}`
`101`	`102`
`102`		`-#ifdefHAVE_TERMIOS_H`
`103`	`103`	`if (!echo)`
`104`	`104`	`{`
	`105`	`+#if defined(HAVE_TERMIOS_H)`
	`106`	`+/* disable echo via tcgetattr/tcsetattr */`
`105`	`107`	`tcgetattr(fileno(termin),&t);`
`106`	`108`	`t_orig=t;`
`107`	`109`	`t.c_lflag &= ~ECHO;`
`108`	`110`	`tcsetattr(fileno(termin),TCSAFLUSH,&t);`
`109`		`-}`
`110`		`-#else`
`111`		`-#ifdefWIN32`
`112`		`-if (!echo)`
`113`		`-{`
`114`		`-/* get a new handle to turn echo off */`
`115`		`-t=GetStdHandle(STD_INPUT_HANDLE);`
	`111`	`+#elif defined(WIN32)`
	`112`	`+/* need the file's HANDLE to turn echo off */`
	`113`	`+t= (HANDLE)_get_osfhandle(_fileno(termin));`
`116`	`114`
`117`	`115`	`/* save the old configuration first */`
`118`	`116`	`GetConsoleMode(t,&t_orig);`
`119`	`117`
`120`	`118`	`/* set to the new mode */`
`121`	`119`	`SetConsoleMode(t,ENABLE_LINE_INPUT \|ENABLE_PROCESSED_INPUT);`
`122`		`-}`
`123`		`-#endif`
`124`	`120`	`#endif`
	`121`	`+}`
`125`	`122`
`126`	`123`	`if (prompt)`
`127`	`124`	`{`
`@@ -151,24 +148,19 @@ simple_prompt(const char prompt, char destination, size_t destlen, bool echo)`
`151`	`148`	`/* remove trailing newline */`
`152`	`149`	`destination[length-1]='\0';`
`153`	`150`
`154`		`-#ifdefHAVE_TERMIOS_H`
`155`	`151`	`if (!echo)`
`156`	`152`	`{`
	`153`	`+/* restore previous echo behavior, then echo \n */`
	`154`	`+#if defined(HAVE_TERMIOS_H)`
`157`	`155`	`tcsetattr(fileno(termin),TCSAFLUSH,&t_orig);`
`158`	`156`	`fputs("\n",termout);`
`159`	`157`	`fflush(termout);`
`160`		`-}`
`161`		`-#else`
`162`		`-#ifdefWIN32`
`163`		`-if (!echo)`
`164`		`-{`
`165`		`-/* reset to the original console mode */`
	`158`	`+#elif defined(WIN32)`
`166`	`159`	`SetConsoleMode(t,t_orig);`
`167`	`160`	`fputs("\n",termout);`
`168`	`161`	`fflush(termout);`
`169`		`-}`
`170`		`-#endif`
`171`	`162`	`#endif`
	`163`	`+}`
`172`	`164`
`173`	`165`	`if (termin!=stdin)`
`174`	`166`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit50485b3

File tree

1 file changed

1 file changed

`‎src/port/sprompt.c`

0 commit comments