summaryrefslogtreecommitdiff
path: root/src/backend/storage/file/fd.c
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:19:39 -0400
commit6fd666954bb98b757b56e4f88cc7a8729b4ec968 (patch)
tree51fd64157a14dc989a5ba3e46f69eed5124c6cd8 /src/backend/storage/file/fd.c
parent14de825dee324cb6b1e8298ee845e1134edcc33e (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/backend/storage/file/fd.c')
-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 465b434f235..1e736c15472 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -2456,7 +2456,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
@@ -2515,7 +2515,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)