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

tglsfdc · tglsfdc · commit e1a7d1b9f3d3 · 2005-09-11T00:36:14.000Z
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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.114 2005/08/23 22:40:31 tgl Exp $`
	`18`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.115 2005/09/11 00:36:14 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -1601,11 +1601,12 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt,`
`1601`	`1601`
`1602`	`1602`	`/*`
`1603`	`1603`	`* On Windows, we need to use binary mode to read/write non-text archive`
`1604`		`- * formats. Force stdin/stdout into binary mode in case that is what`
	`1604`	`+ * formats. Force stdin/stdout into binary mode if that is what`
`1605`	`1605`	`* we are using.`
`1606`	`1606`	`*/`
`1607`	`1607`	`#ifdef WIN32`
`1608`		`- if (fmt != archNull)`
	`1608`	`+ if (fmt != archNull &&`
	`1609`	`+ (AH->fSpec == NULL \|\| strcmp(AH->fSpec, "") == 0))`
`1609`	`1610`	`{`
`1610`	`1611`	`if (mode == archModeWrite)`
`1611`	`1612`	`setmode(fileno(stdout), O_BINARY);`