diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-01-26 19:44:53 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-01-26 19:44:53 +0000 |
| commit | b5aef556941daf9d68708e02b94f4b0e672d66e0 (patch) | |
| tree | 0e1b76d42e4cbb395b7aab4da8cd7d37a9312f88 | |
| parent | 953570a8999cd7e8d79f9f62d98522a59d452c61 (diff) | |
| download | postgresql-b5aef556941daf9d68708e02b94f4b0e672d66e0.tar.gz | |
Make pg_dump and pg_restore handle binary archive formats correctly
when using stdout/stdin on Windows.
| -rw-r--r-- | src/bin/pg_dump/pg_backup_archiver.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 535c13b317..b424b62621 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.101.4.2 2005/01/25 22:44:46 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.101.4.3 2005/01/26 19:44:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -29,6 +29,10 @@ #include <ctype.h> #include <unistd.h> +#ifdef WIN32 +#include <io.h> +#endif + #include "pqexpbuffer.h" #include "libpq/libpq-fs.h" @@ -1709,6 +1713,21 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt, AH->gzOut = 0; AH->OF = stdout; + /* + * On Windows, we need to use binary mode to read/write non-text archive + * formats. Force stdin/stdout into binary mode in case that is what + * we are using. + */ +#ifdef WIN32 + if (fmt != archNull) + { + if (mode == archModeWrite) + setmode(fileno(stdout), O_BINARY); + else + setmode(fileno(stdin), O_BINARY); + } +#endif + #if 0 write_msg(modulename, "archive format is %d\n", fmt); #endif @@ -1720,7 +1739,6 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt, switch (AH->format) { - case archCustom: InitArchiveFmt_Custom(AH); break; |