From 456ff0863851d70dce679ca3f631392589e31a33 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Tue, 5 May 2015 08:30:28 -0400 Subject: [PATCH] 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. --- src/backend/storage/file/fd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 99dac841ff..6fa75d18d3 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)