NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitcedd25a

committed

Fix pg_basebackup output to stdout on Windows.

When writing a backup to stdout with pg_basebackup on Windows, put stdoutto binary mode. Any CR bytes in the output will otherwise be outputincorrectly as CR+LF.In the passing, standardize on using "_setmode" instead of "setmode", forthe sake of consistency. They both do the same thing, but according toMSDN 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

1 parent3b0c2db commitcedd25aCopy full SHA for cedd25a

File tree

2 files changed

-2

lines changed

src/bin
- pg_basebackup
  - pg_basebackup.c
- pg_dump
  - pg_backup_archiver.c

2 files changed

-2

lines changed

`‎src/bin/pg_basebackup/pg_basebackup.c`

Lines changed: 4 additions & 0 deletions

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`	`+#ifdefWIN32`
	`810`	`+_setmode(fileno(stdout),_O_BINARY);`
	`811`	`+#endif`
	`812`	`+`
`809`	`813`	`#ifdefHAVE_LIBZ`
`810`	`814`	`if (compresslevel!=0)`
`811`	`815`	`{`

`‎src/bin/pg_dump/pg_backup_archiver.c`

Lines changed: 2 additions & 2 deletions

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`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcedd25a

File tree

2 files changed

2 files changed

`‎src/bin/pg_basebackup/pg_basebackup.c`

`‎src/bin/pg_dump/pg_backup_archiver.c`

0 commit comments