mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I've recently written to pgsql-ports about a problem with PG7.0 on NT

Browse Source 
(Subj: [PORTS] initdb problem on NT with 7.0).  Since nobody helped me,
I had to find out the reson.  The difference between NT and Linux (for
instance) is that "open( path, O_RDWR );" opens a file in text mode.  So
sometime less block can be read than required.

I suggest a following patch.  BTW the situation appeared before, see
hba.c, pqcomm.c and others.


Alexei Zakharov
This commit is contained in:
Bruce Momjian 2000-03-07 23:49:31 +00:00
parent 9606f36210
commit 8fa8f80c1a
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/access/transam/xlog.c
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.10 2000/02/15 03:00:37 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.11 2000/03/07 23:49:31 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -726,7 +726,11 @@ XLogFileInit(uint32 log, uint32 seg)
unlink(path); unlink(path);
tryAgain: tryAgain:
#ifndef __CYGWIN__
fd = open(path, O_RDWR|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); fd = open(path, O_RDWR|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR);
#else
fd = open(path, O_RDWR|O_CREAT|O_EXCL|O_BINARY, S_IRUSR|S_IWUSR);
#endif
if (fd < 0 && (errno == EMFILE || errno == ENFILE)) if (fd < 0 && (errno == EMFILE || errno == ENFILE))
{ {
fd = errno; fd = errno;
@ -767,7 +771,11 @@ XLogFileOpen(uint32 log, uint32 seg, bool econt)
XLogFileName(path, log, seg); XLogFileName(path, log, seg);
tryAgain: tryAgain:
#ifndef __CYGWIN__
fd = open(path, O_RDWR); fd = open(path, O_RDWR);
#else
fd = open(path, O_RDWR | O_BINARY);
#endif
if (fd < 0 && (errno == EMFILE || errno == ENFILE)) if (fd < 0 && (errno == EMFILE || errno == ENFILE))
{ {
fd = errno; fd = errno;
@ -1083,7 +1091,11 @@ UpdateControlFile()
int fd; int fd;
tryAgain: tryAgain:
#ifndef __CYGWIN__
fd = open(ControlFilePath, O_RDWR); fd = open(ControlFilePath, O_RDWR);
#else
fd = open(ControlFilePath, O_RDWR | O_BINARY);
#endif
if (fd < 0 && (errno == EMFILE || errno == ENFILE)) if (fd < 0 && (errno == EMFILE || errno == ENFILE))
{ {
fd = errno; fd = errno;
@ -1145,7 +1157,11 @@ BootStrapXLOG()
CheckPoint checkPoint; CheckPoint checkPoint;
XLogRecord *record; XLogRecord *record;
#ifndef __CYGWIN__
fd = open(ControlFilePath, O_RDWR|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); fd = open(ControlFilePath, O_RDWR|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR);
#else
fd = open(ControlFilePath, O_RDWR|O_CREAT|O_EXCL|O_BINARY, S_IRUSR|S_IWUSR);
#endif
if (fd < 0) if (fd < 0)
elog(STOP, "BootStrapXLOG failed to create control file (%s): %d", elog(STOP, "BootStrapXLOG failed to create control file (%s): %d",
ControlFilePath, errno); ControlFilePath, errno);
@ -1249,7 +1265,11 @@ StartupXLOG()
* Open/read Control file * Open/read Control file
*/ */
tryAgain: tryAgain:
#ifndef __CYGWIN__
fd = open(ControlFilePath, O_RDWR); fd = open(ControlFilePath, O_RDWR);
#else
fd = open(ControlFilePath, O_RDWR | O_BINARY);
#endif
if (fd < 0 && (errno == EMFILE || errno == ENFILE)) if (fd < 0 && (errno == EMFILE || errno == ENFILE))
{ {
fd = errno; fd = errno;