summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Haas2015-05-05 12:30:28 +0000
committerRobert Haas2015-05-05 13:29:49 +0000
commit456ff0863851d70dce679ca3f631392589e31a33 (patch)
tree4fe3ae9b8f09219754bc1817d0cc35f0700d175b
parentc0574cd5aa96b988bb1f0287914dcc8b52fb01bd (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.
-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 99dac841ffa..6fa75d18d30 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -2450,7 +2450,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
@@ -2509,7 +2509,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)