Fix pg_basebackup output to stdout on Windows.

hlinnaka · hlinnaka · commit cedd25ae8877 · 2017-07-14T16:03:05.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
@@ -806,6 +806,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
@@ -2337,9 +2337,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
`@@ -806,6 +806,10 @@ ReceiveTarFile(PGconn conn, PGresult res, int rownum)`
`806`	`806`	`*/`
`807`	`807`	`if (strcmp(basedir, "-") == 0)`
`808`	`808`	`{`
	`809`	`+#ifdef WIN32`
	`810`	`+ _setmode(fileno(stdout), _O_BINARY);`
	`811`	`+#endif`
	`812`	`+`
`809`	`813`	`#ifdef HAVE_LIBZ`
`810`	`814`	`if (compresslevel != 0)`
`811`	`815`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2337,9 +2337,9 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt,`
`2337`	`2337`	`(AH->fSpec == NULL \|\| strcmp(AH->fSpec, "") == 0))`
`2338`	`2338`	`{`
`2339`	`2339`	`if (mode == archModeWrite)`
`2340`		`- setmode(fileno(stdout), O_BINARY);`
	`2340`	`+ _setmode(fileno(stdout), O_BINARY);`
`2341`	`2341`	`else`
`2342`		`- setmode(fileno(stdin), O_BINARY);`
	`2342`	`+ _setmode(fileno(stdin), O_BINARY);`
`2343`	`2343`	`}`
`2344`	`2344`	`#endif`
`2345`	`2345`