diff options
| author | Magnus Hagander <magnus@hagander.net> | 2008-09-24 08:59:44 +0000 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2008-09-24 08:59:44 +0000 |
| commit | c4e5ec592fb04def28fbcb63da6573520047d89c (patch) | |
| tree | 60abc2bced78f5774af4c35f0e7df49321450867 | |
| parent | 6967e894fdf930f320cc948f6110b8b70a3e3219 (diff) | |
| download | postgresql-c4e5ec592fb04def28fbcb63da6573520047d89c.tar.gz postgresql-c4e5ec592fb04def28fbcb63da6573520047d89c.zip | |
Make sure pg_control is opened in binary mode, to deal
with situtations when the file contains an EOF maker
(0x1A) on Windows.
ITAGAKI Takahiro
| -rw-r--r-- | src/bin/pg_controldata/pg_controldata.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_resetxlog/pg_resetxlog.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c index cbde5357edf..8472ef7ae03 100644 --- a/src/bin/pg_controldata/pg_controldata.c +++ b/src/bin/pg_controldata/pg_controldata.c @@ -6,7 +6,7 @@ * copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001; * licence: BSD * - * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.31 2006/08/21 16:16:31 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.31.2.1 2008/09/24 08:59:44 mha Exp $ */ #include "postgres.h" @@ -106,7 +106,7 @@ main(int argc, char *argv[]) snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir); - if ((fd = open(ControlFilePath, O_RDONLY, 0)) == -1) + if ((fd = open(ControlFilePath, O_RDONLY | PG_BINARY, 0)) == -1) { fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"), progname, ControlFilePath, strerror(errno)); diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c index 15613832792..d90258a5331 100644 --- a/src/bin/pg_resetxlog/pg_resetxlog.c +++ b/src/bin/pg_resetxlog/pg_resetxlog.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.53 2006/10/04 00:30:05 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.53.2.1 2008/09/24 08:59:44 mha Exp $ * *------------------------------------------------------------------------- */ @@ -366,7 +366,7 @@ ReadControlFile(void) char *buffer; pg_crc32 crc; - if ((fd = open(XLOG_CONTROL_FILE, O_RDONLY, 0)) < 0) + if ((fd = open(XLOG_CONTROL_FILE, O_RDONLY | PG_BINARY, 0)) < 0) { /* * If pg_control is not there at all, or we can't read it, the odds |