Fix pg_basebackup output to stdout on Windows.

hlinnaka · hlinnaka · commit 8046465c2ecf · 2017-07-14T16:02:53.000+03:00
When writing a backup to stdout with pg_basebackup on Windows, put stdout to binary mode. Any CR bytes in the output will otherwise be output incorrectly as CR+LF. In the passing, standardize on using "_setmode" instead of "setmode", for the sake of consistency. They both do the same thing, but according to MSDN documentation, setmode is deprecated. Fixes bug #14634, reported by Henry Boehlert. Patch by Haribabu Kommi. Backpatch to all supported versions. Discussion: https://www.postgresql.org/message-id/20170428082818.24366.13134@wrigleys.postgresql.org
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -954,6 +954,10 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 		 */
 		if (strcmp(basedir, "-") == 0)
 		{
+#ifdef WIN32
+			_setmode(fileno(stdout), _O_BINARY);
+#endif
+
 #ifdef HAVE_LIBZ
 			if (compresslevel != 0)
 			{
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
@@ -2346,9 +2346,9 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt,
 		(AH->fSpec == NULL || strcmp(AH->fSpec, "") == 0))
 	{
 		if (mode == archModeWrite)
-			setmode(fileno(stdout), O_BINARY);
+			_setmode(fileno(stdout), O_BINARY);
 		else
-			setmode(fileno(stdin), O_BINARY);
+			_setmode(fileno(stdin), O_BINARY);
 	}
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -954,6 +954,10 @@ ReceiveTarFile(PGconn conn, PGresult res, int rownum)`
`954`	`954`	`*/`
`955`	`955`	`if (strcmp(basedir, "-") == 0)`
`956`	`956`	`{`
	`957`	`+#ifdef WIN32`
	`958`	`+ _setmode(fileno(stdout), _O_BINARY);`
	`959`	`+#endif`
	`960`	`+`
`957`	`961`	`#ifdef HAVE_LIBZ`
`958`	`962`	`if (compresslevel != 0)`
`959`	`963`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2346,9 +2346,9 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt,`
`2346`	`2346`	`(AH->fSpec == NULL \|\| strcmp(AH->fSpec, "") == 0))`
`2347`	`2347`	`{`
`2348`	`2348`	`if (mode == archModeWrite)`
`2349`		`- setmode(fileno(stdout), O_BINARY);`
	`2349`	`+ _setmode(fileno(stdout), O_BINARY);`
`2350`	`2350`	`else`
`2351`		`- setmode(fileno(stdin), O_BINARY);`
	`2351`	`+ _setmode(fileno(stdin), O_BINARY);`
`2352`	`2352`	`}`
`2353`	`2353`	`#endif`
`2354`	`2354`