pg.ddx.io  pgsql-committers@postgresql.org mailing list archive  
help / color / mirror / Atom feed
From: Tom Lane <tgl@sss.pgh.pa.us>
To: Michael Paquier <michael@paquier.xyz>
Cc: pgsql-hackers@lists.postgresql.org
Subject: Re: pgsql: Allow concurrent-safe open() and fopen() in frontend code for Wi
Date: Mon, 17 Sep 2018 19:38:24 -0400
Message-ID: <11148.1537227504@sss.pgh.pa.us> (raw)
In-Reply-To: <3883.1537200836@sss.pgh.pa.us>
References: <E1g0cYN-0003oE-IE@gemulon.postgresql.org>
	<23543.1536938575@sss.pgh.pa.us>
	<20180914224939.GA1178@paquier.xyz>
	<20180917114113.GA31460@paquier.xyz>
	<17194.1537191697@sss.pgh.pa.us>
	<20180917140202.GF31460@paquier.xyz>
	<19655.1537195712@sss.pgh.pa.us>
	<f62917d5-cc77-c6ac-847f-44f922ccdd97@2ndQuadrant.com>
	<3883.1537200836@sss.pgh.pa.us>

So we seem to be out of the woods in terms of 0ba06e0bf breaking the
regression tests, but I'm not very happy about the whole thing, because
that patch wasn't supposed to change the behavior of open/fopen in any
way other than allowing concurrent file access.  Obviously, it did.

After looking at src/port/open.c a bit, it seems like the problem is
that our fopen() requires a nonstandard "t" option to select text mode.
I'd always supposed that you got binary mode with "b" and text mode
otherwise; is there some third possibility on Windows?

Anyway, I'm inclined to propose that we ought to do something like
the attached in HEAD and v11 in order to reduce the risk that there
are other unexpected behavioral changes.  This should also let us
revert 0ba06e0bf's change in initdb.c.

I wonder whether pgwin32_open() also ought to enforce that either
O_BINARY or O_TEXT mode gets selected.

			regards, tom lane

Attachments:

  [text/x-diff] force-either-binary-or-text-open-mode.patch (920B, ../11148.1537227504@sss.pgh.pa.us/2-force-either-binary-or-text-open-mode.patch)
  download | inline diff:
diff --git a/src/port/open.c b/src/port/open.c
index a3ad946..85ab06e 100644
--- a/src/port/open.c
+++ b/src/port/open.c
@@ -154,7 +154,7 @@ pgwin32_fopen(const char *fileName, const char *mode)
 
 	if (strchr(mode, 'b'))
 		openmode |= O_BINARY;
-	if (strchr(mode, 't'))
+	else
 		openmode |= O_TEXT;
 
 	fd = pgwin32_open(fileName, openmode);
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index b53d6eb..cb8c745 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -491,15 +491,7 @@ readfile(const char *path)
 	char	   *buffer;
 	int			c;
 
-#ifdef WIN32
-	/*
-	 * On Windows, we have to open the file in text mode so that carriage
-	 * returns are stripped.
-	 */
-	if ((infile = fopen(path, "rt")) == NULL)
-#else
 	if ((infile = fopen(path, "r")) == NULL)
-#endif
 	{
 		fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),
 				progname, path, strerror(errno));

view thread (24+ messages)  latest in thread

Message-ID: <11148.1537227504@sss.pgh.pa.us>
Permalink:  ../11148.1537227504@sss.pgh.pa.us/
Also on:    postgresql.org/message-id/11148.1537227504@sss.pgh.pa.us

 ·  · 

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: pgsql-committers@postgresql.org
  Cc: tgl@sss.pgh.pa.us, michael@paquier.xyz, pgsql-hackers@lists.postgresql.org
  Subject: Re: pgsql: Allow concurrent-safe open() and fopen() in frontend code for Wi
  In-Reply-To: <11148.1537227504@sss.pgh.pa.us>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox