Avoid changing stdin/stdout to binary mode on Windows unless that is

really the source or destination of the archive.  I think this will
resolve recent complaints that password prompting is broken in pg_restore
on Windows.  Note that password prompting and reading from stdin is an
unworkable combination on Windows ... but that was true anyway.

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index e956bac46515ef0c8e1ee6955e4421468f1ea65e..f03f2c2d4e189218ffcfaccb9ac9471f6f4f5560 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *             $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.114 2005/08/23 22:40:31 tgl Exp $
+ *             $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.115 2005/09/11 00:36:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1601,11 +1601,12 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt,
 
        /*
         * On Windows, we need to use binary mode to read/write non-text archive
-        * formats.  Force stdin/stdout into binary mode in case that is what
+        * formats.  Force stdin/stdout into binary mode if that is what
         * we are using.
         */
 #ifdef WIN32
-       if (fmt != archNull)
+       if (fmt != archNull &&
+               (AH->fSpec == NULL || strcmp(AH->fSpec, "") == 0))
        {
                if (mode == archModeWrite)
                        setmode(fileno(stdout), O_BINARY);