summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2015-05-05 08:30:28 -0400
committerRobert Haas <rhaas@postgresql.org>2015-05-05 09:22:51 -0400
commit53e1498c658d46f6fa99c63beabb350dae3c03ed (patch)
tree63ba755614f00141989b60d40c8c5702a19369b5 /src
parent2bc3397168580a28a1f072bec46d395f4eb54c08 (diff)
Fix some problems with patch to fsync the data directory.
pg_win32_is_junction() was a typo for pgwin32_is_junction(). open() was used not only in a two-argument form, which breaks on Windows, but also where BasicOpenFile() should have been used. Per reports from Andrew Dunstan and David Rowley.
Diffstat (limited to 'src')
-rw-r--r--src/backend/storage/file/fd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 193164c84dc..7552ba0b402 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -2276,7 +2276,7 @@ pre_sync_fname(char *fname, bool isdir)
{
int fd;
- fd = open(fname, O_RDONLY | PG_BINARY);
+ fd = BasicOpenFile(fname, O_RDONLY | PG_BINARY, 0);
/*
* Some OSs don't allow us to open directories at all (Windows returns
@@ -2335,7 +2335,7 @@ walkdir(char *path, void (*action) (char *fname, bool isdir))
#ifndef WIN32
else if (S_ISLNK(fst.st_mode))
#else
- else if (pg_win32_is_junction(subpath))
+ else if (pgwin32_is_junction(subpath))
#endif
{
#if defined(HAVE_READLINK) || defined(WIN32)