Make sure pg_control is opened in binary mode, to deal

mhagander · mhagander · commit 607b7166d8c9 · 2008-09-24T08:59:42.000Z
with situtations when the file contains an EOF maker
(0x1A) on Windows.

ITAGAKI Takahiro
diff --git 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.40 2008/09/23 09:20:37 heikki Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.41 2008/09/24 08:59:42 mha Exp $
  */
 #include "postgres_fe.h"
 
@@ -107,7 +107,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
@@ -23,7 +23,7 @@
  * Portions Copyright (c) 1996-2008, 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.66 2008/09/23 09:20:38 heikki Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.67 2008/09/24 08:59:42 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -373,7 +373,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

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;`
`7`	`7`	`* licence: BSD`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.40 2008/09/23 09:20:37 heikki Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.41 2008/09/24 08:59:42 mha Exp $`
`10`	`10`	`*/`
`11`	`11`	`#include "postgres_fe.h"`
`12`	`12`
`@@ -107,7 +107,7 @@ main(int argc, char *argv[])`
`107`	`107`
`108`	`108`	`snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);`
`109`	`109`
`110`		`- if ((fd = open(ControlFilePath, O_RDONLY, 0)) == -1)`
	`110`	`+ if ((fd = open(ControlFilePath, O_RDONLY \| PG_BINARY, 0)) == -1)`
`111`	`111`	`{`
`112`	`112`	`fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),`
`113`	`113`	`progname, ControlFilePath, strerror(errno));`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`24`	`24`	`* Portions Copyright (c) 1994, Regents of the University of California`
`25`	`25`	`*`
`26`		`- * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.66 2008/09/23 09:20:38 heikki Exp $`
	`26`	`+ * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.67 2008/09/24 08:59:42 mha Exp $`
`27`	`27`	`*`
`28`	`28`	`*-------------------------------------------------------------------------`
`29`	`29`	`*/`
`@@ -373,7 +373,7 @@ ReadControlFile(void)`
`373`	`373`	`char *buffer;`
`374`	`374`	`pg_crc32 crc;`
`375`	`375`
`376`		`- if ((fd = open(XLOG_CONTROL_FILE, O_RDONLY, 0)) < 0)`
	`376`	`+ if ((fd = open(XLOG_CONTROL_FILE, O_RDONLY \| PG_BINARY, 0)) < 0)`
`377`	`377`	`{`
`378`	`378`	`/*`
`379`	`379`	`* If pg_control is not there at all, or we can't read it, the odds`