Fix pg_basebackup output to stdout on Windows.

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[email protected]

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 5c9bf68ffbf855827b61fef7da338f47f1308ad1..8cbd078376033ea99db60ffa9878379799c9c05a 100644 (file)
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -583,6 +583,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
index 53b25550beb9000cf91935d3f41f4275297bfe44..c788e707ddd736d067f57c431f91339c62719f7b 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -2101,9 +2101,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