diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2017-07-14 16:02:53 +0300 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2017-07-14 16:03:05 +0300 |
| commit | cedd25ae8877cb7a465c3b42db7dab20873e162c (patch) | |
| tree | 4005c7e0e7d93c20f2f4af87a0278dcb0de9cfce | |
| parent | 3b0c2dbed07e52b73a87d94ed128784eb5c25de7 (diff) | |
| download | postgresql-cedd25ae8877cb7a465c3b42db7dab20873e162c.tar.gz postgresql-cedd25ae8877cb7a465c3b42db7dab20873e162c.zip | |
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.24366.13134@wrigleys.postgresql.org
| -rw-r--r-- | src/bin/pg_basebackup/pg_basebackup.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_backup_archiver.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index 613f2e159c3..4e3a45f9892 100644 --- 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 index a23b070c0e8..6483563f3d7 100644 --- 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 |