On Mon, Oct 15, 2012 at 05:41:36AM -0400, Noah Misch wrote:
> > --- a/src/port/sprompt.c
> > +++ b/src/port/sprompt.c
> > @@ -60,8 +60,13 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
> > * Do not try to collapse these into one "w+" mode file. Doesn't work on
> > * some platforms (eg, HPUX 10.20).
> > */
> > +#ifdef WIN32
> > + termin = fopen("CONIN$", "r");
> > + termout = fopen("CONOUT$", "w+");
>
> This definitely needs a block comment explaining the behaviors that led us to
> select this particular implementation.
>
> > +#else
> > termin = fopen(DEVTTY, "r");
> > termout = fopen(DEVTTY, "w");
>
> This thread has illustrated that the DEVTTY abstraction does not suffice. I
> think we should remove it entirely. Remove it from port.h; use literal
> "/dev/tty" here; re-add it as a local #define near the one remaining use, with
> an XXX comment indicating that the usage is broken.
>
> If it would help, I can prepare a version with the comment changes and
> refactoring I have in mind.
Following an off-list ack from Alexander, here is that version. No functional
differences from Alexander's latest version, and I have verified that it still
fixes the original test case. I'm marking this Ready for Committer.
To test this on an English (United States) copy of Windows 7, I made two
configuration changes in the "Region and Language" control panel. On the
"Administrative" tab, choose "Change system locale..." and select Russian
(Russia). After the reboot, choose "Russian (Russia)" on the "Format" tab.
(Neither of these changes will affect the display language of most Windows UI
components.) Finally, run "initdb -W testdatadir". Before the patch, the
password prompt contained some line-drawing characters and other garbage.
Afterward, it matches the string in src/bin/initdb/po/ru.po.
Thanks,
nm
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 1043,1048 **** exec_command(const char *cmd,
--- 1043,1059 ----
char *fname = psql_scan_slash_option(scan_state,
OT_NORMAL, NULL, true);
+ #if defined(WIN32) && !defined(__CYGWIN__)
+
+ /*
+ * XXX This does not work for all terminal environments or for
output
+ * containing non-ASCII characters; see comments in
simple_prompt().
+ */
+ #define DEVTTY "con"
+ #else
+ #define DEVTTY "/dev/tty"
+ #endif
+
expand_tilde(&fname);
/* This scrolls off the screen when using /dev/tty */
success = saveHistory(fname ? fname : DEVTTY, -1, false, false);
*** a/src/include/port.h
--- b/src/include/port.h
***************
*** 110,120 **** extern BOOL AddUserToTokenDacl(HANDLE hToken);
#if defined(WIN32) && !defined(__CYGWIN__)
#define DEVNULL "nul"
- /* "con" does not work from the Msys 1.0.10 console (part of MinGW). */
- #define DEVTTY "con"
#else
#define DEVNULL "/dev/null"
- #define DEVTTY "/dev/tty"
#endif
/*
--- 110,117 ----
*** a/src/port/sprompt.c
--- b/src/port/sprompt.c
***************
*** 56,70 **** simple_prompt(const char *prompt, int maxlen, bool echo)
if (!destination)
return NULL;
/*
* Do not try to collapse these into one "w+" mode file. Doesn't work on
* some platforms (eg, HPUX 10.20).
*/
! termin = fopen(DEVTTY, "r");
! termout = fopen(DEVTTY, "w");
if (!termin || !termout
#ifdef WIN32
! /* See DEVTTY comment for msys */
|| (getenv("OSTYPE") && strcmp(getenv("OSTYPE"), "msys") == 0)
#endif
)
--- 56,97 ----
if (!destination)
return NULL;
+ #ifdef WIN32
+
+ /*
+ * A Windows console has an "input code page" and an "output code page";
+ * these usually match each other, but they rarely match the "Windows
ANSI
+ * code page" defined at system boot and expected of "char *" arguments
to
+ * Windows API functions. The Microsoft CRT write() implementation
+ * automatically converts text between these code pages when writing to
a
+ * console. To identify such file descriptors, it calls
GetConsoleMode()
+ * on the underlying HANDLE, which in turn requires GENERIC_READ access
on
+ * the HANDLE. Opening termout in mode "w+" allows that detection to
+ * succeed. Otherwise, write() would not recognize the descriptor as a
+ * console, and non-ASCII characters would display incorrectly.
+ *
+ * XXX fgets() still receives text in the console's input code page.
This
+ * makes non-ASCII credentials unportable.
+ */
+ termin = fopen("CONIN$", "r");
+ termout = fopen("CONOUT$", "w+");
+ #else
+
/*
* Do not try to collapse these into one "w+" mode file. Doesn't work on
* some platforms (eg, HPUX 10.20).
*/
! termin = fopen("/dev/tty", "r");
! termout = fopen("/dev/tty", "w");
! #endif
if (!termin || !termout
#ifdef WIN32
! /*
! * Direct console I/O does not work from the MSYS 1.0.10 console.
Writes
! * reach nowhere user-visible; reads block indefinitely. XXX This
affects
! * most Windows terminal environments, including rxvt, mintty, Cygwin
! * xterm, Cygwin sshd, and PowerShell ISE. Switch to a more-generic
test.
! */
|| (getenv("OSTYPE") && strcmp(getenv("OSTYPE"), "msys") == 0)
#endif
)
--
Sent via pgsql-bugs mailing list (pgsql-bugs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-bugs
