BUG #15858: could not stat file - over 4GB

diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index f4841fb..3b4d2bd 100644
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -52,7 +52,19 @@
 #include <direct.h>
 #include <sys/utime.h>			/* for non-unicode version */
 #undef near
+/*
+ * We need to define _CRT_NO_TIME_T in order to prevent the definition of
+ * struct stat and replace it with struct _stat64
+ */
+#if defined(_MSC_VER)
+#define HAVE_STRUCT_STAT64
+#define _CRT_NO_TIME_T
+#include <sys/types.h>
+#include <sys/stat.h>
+#undef _CRT_NO_TIME_T
+#else
 #include <sys/stat.h>			/* needed before sys/stat hacking below */
+#endif
 
 /* Must be here to avoid conflicting with prototype in windows.h */
 #define mkdir(a,b)	mkdir(a)
@@ -251,6 +263,34 @@ typedef int pid_t;
  * We must pull in sys/stat.h before this part, else our overrides lose.
  */
 #define lstat(path, sb) stat(path, sb)
+#if defined(HAVE_STRUCT_STAT64)
+struct stat                     /* It is actually _stat64 */
+{
+    _dev_t         st_dev;
+    _ino_t         st_ino;
+    unsigned short st_mode;
+    short          st_nlink;
+    short          st_uid;
+    short          st_gid;
+    _dev_t         st_rdev;
+    __int64        st_size;
+    __time64_t     st_atime;
+    __time64_t     st_mtime;
+    __time64_t     st_ctime;
+};
+static __inline int
+fstat(int const _FileName, struct stat* const _Stat)
+{
+    Assert(sizeof(struct stat) == sizeof(struct _stat64));
+    return _fstat64(_FileName, (struct _stat64*)_Stat);
+}
+static __inline int
+stat(char const* const _FileName, struct stat* const _Stat)
+{
+    Assert(sizeof(struct stat) == sizeof(struct _stat64));
+    return _stat64(_FileName, (struct _stat64*)_Stat);
+}
+#endif
 
 /*
  * stat() is not guaranteed to set the st_size field on win32, so we
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index d793240..01cb85d 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -395,11 +395,10 @@ pgwin32_safestat(const char *path, struct stat *buf)
 		return -1;
 	}
 
-	/*
-	 * XXX no support for large files here, but we don't do that in general on
-	 * Win32 yet.
-	 */
-	buf->st_size = attr.nFileSizeLow;
+	if (sizeof(buf->st_size) < sizeof(uint64))
+		buf->st_size = attr.nFileSizeLow;
+	else
+		buf->st_size = ((uint64) attr.nFileSizeHigh) << 32 | attr.nFileSizeLow;
 
 	return 0;
 }

From 80fb66c1feb783ee6366aa3e1315395205060021 Mon Sep 17 00:00:00 2001
From: Juan Jose Santamaria Flecha <juanjo.santamaria@gmail.com>
Date: Mon, 24 Jun 2019 12:56:13 -0400
Subject: [PATCH] WIP support for large files on Win32 . Workaround for Windows
 <sys/stat.h> shortcomings, reimplement fstat()/stat() on top of
 GetFileAttributesEx() and use 64 bits struct stat.

---
 configure                     |  11 ++++
 src/include/port/win32_port.h |  62 +++++++++++++++---
 src/port/dirmod.c             |  52 ---------------
 src/port/stat_pg_fixed.c      | 149 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 214 insertions(+), 60 deletions(-)
 create mode 100644 src/port/stat_pg_fixed.c

diff --git a/configure b/configure
index 8d47071..e8dcfcb 100755
--- a/configure
+++ b/configure
@@ -16204,6 +16204,12 @@ fi
 esac
 
   case " $LIBOBJS " in
+  *" stat_pg_fixed.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS stat_pg_fixed.$ac_objext"
+ ;;
+esac
+
+  case " $LIBOBJS " in
   *" kill.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS kill.$ac_objext"
  ;;
@@ -16282,6 +16288,11 @@ if test "$PORTNAME" = "cygwin"; then
  ;;
 esac
 
+  case " $LIBOBJS " in
+  *" stat_pg_fixed.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS stat_pg_fixed.$ac_objext"
+ ;;
+esac
 fi
 
 ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index f4841fb..fd1620b 100644
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -52,7 +52,12 @@
 #include <direct.h>
 #include <sys/utime.h>			/* for non-unicode version */
 #undef near
-#include <sys/stat.h>			/* needed before sys/stat hacking below */
+/* needed before sys/stat hacking below */
+#define fstat microsoft_native_fstat
+#define stat microsoft_native_stat
+#include <sys/stat.h>
+#undef fstat
+#undef stat
 
 /* Must be here to avoid conflicting with prototype in windows.h */
 #define mkdir(a,b)	mkdir(a)
@@ -254,15 +259,56 @@ typedef int pid_t;
 
 /*
  * stat() is not guaranteed to set the st_size field on win32, so we
- * redefine it to our own implementation that is.
+ * redefine it to our own implementation. See src/port/stat_pg_fixed.c
  *
- * Some frontends don't need the size from stat, so if UNSAFE_STAT_OK
- * is defined we don't bother with this.
+ * The struct stat is 32 bit in MSVC so we redefine it as a copy of struct
+ * _stat64. This also fixes the struct size across Cygwin and MINGW builds.
  */
-#ifndef UNSAFE_STAT_OK
-extern int	pgwin32_safestat(const char *path, struct stat *buf);
-#define stat(a,b) pgwin32_safestat(a,b)
-#endif
+struct stat                     /* It is actually _stat64 */
+{
+	_dev_t         st_dev;
+	_ino_t         st_ino;
+	unsigned short st_mode;
+	short          st_nlink;
+	short          st_uid;
+	short          st_gid;
+	_dev_t         st_rdev;
+	__int64        st_size;
+	__time64_t     st_atime;
+	__time64_t     st_mtime;
+	__time64_t     st_ctime;
+};
+extern int _pgfstat64(int fileno, struct stat *buf);
+extern int _pgstat64(char const *name, struct stat *buf);
+#if defined(_MSC_VER)
+static __inline int __CRTDECL
+fstat(int _Filenumber, struct stat* _Stat)
+{
+	_STATIC_ASSERT(sizeof(struct stat) == sizeof(struct __stat64));
+	return _pgfstat64(_Filenumber, _Stat);
+}
+
+static __inline int __CRTDECL
+stat(char* const _Filename, struct stat* _Stat)
+{
+	_STATIC_ASSERT(sizeof(struct stat) == sizeof(struct __stat64));
+	return _pgstat64(_Filename, _Stat);
+}
+#else /* defined(__MINGW32__) || defined(__MINGW64__) || defined(__CYGWIN__) */
+static __inline__ int
+fstat(int _Filenumber, struct stat* _Stat)
+{
+	Assert(sizeof(struct stat) == sizeof(struct __stat64));
+	return _pgfstat64(_Filenumber, _Stat);
+}
+
+static __inline__ int
+stat(char* const _Filename, struct stat* _Stat)
+{
+	Assert(sizeof(struct stat) == sizeof(struct __stat64));
+	return _pgstat64(_Filename, _Stat);
+}
+#endif /* defined(_MSC_VER) */
 
 /* These macros are not provided by older MinGW, nor by MSVC */
 #ifndef S_IRUSR
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index d793240..ec4b47f 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -353,55 +353,3 @@ pgwin32_is_junction(const char *path)
 	return ((attr & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT);
 }
 #endif							/* defined(WIN32) && !defined(__CYGWIN__) */
-
-
-#if defined(WIN32) && !defined(__CYGWIN__)
-
-#undef stat
-
-/*
- * The stat() function in win32 is not guaranteed to update the st_size
- * field when run. So we define our own version that uses the Win32 API
- * to update this field.
- */
-int
-pgwin32_safestat(const char *path, struct stat *buf)
-{
-	int			r;
-	WIN32_FILE_ATTRIBUTE_DATA attr;
-
-	r = stat(path, buf);
-	if (r < 0)
-	{
-		if (GetLastError() == ERROR_DELETE_PENDING)
-		{
-			/*
-			 * File has been deleted, but is not gone from the filesystem yet.
-			 * This can happen when some process with FILE_SHARE_DELETE has it
-			 * open and it will be fully removed once that handle is closed.
-			 * Meanwhile, we can't open it, so indicate that the file just
-			 * doesn't exist.
-			 */
-			errno = ENOENT;
-			return -1;
-		}
-
-		return r;
-	}
-
-	if (!GetFileAttributesEx(path, GetFileExInfoStandard, &attr))
-	{
-		_dosmaperr(GetLastError());
-		return -1;
-	}
-
-	/*
-	 * XXX no support for large files here, but we don't do that in general on
-	 * Win32 yet.
-	 */
-	buf->st_size = attr.nFileSizeLow;
-
-	return 0;
-}
-
-#endif
diff --git a/src/port/stat_pg_fixed.c b/src/port/stat_pg_fixed.c
new file mode 100644
index 0000000..98de7c4
--- /dev/null
+++ b/src/port/stat_pg_fixed.c
@@ -0,0 +1,149 @@
+/*-------------------------------------------------------------------------
+ *
+ * stat_pg_fixed.c
+ *	  Replacements for <sys/stat.h> functions using GetFileAttributesEx on
+ *    Win32.
+ *
+ * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/port/stat_pg_fixed.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifdef WIN32
+
+#include "c.h"
+#include <tchar.h>
+#if defined(__CYGWIN__)
+#include <w32api/windows.h>
+#else
+#include <windows.h>
+#endif
+
+static const unsigned __int64 EpochShift = UINT64CONST(116444736000000000);
+
+/* Converts FILETIME to time_t */
+static __time64_t
+cvt_ft2ut(FILETIME const * ft)
+{
+	ULARGE_INTEGER unified_ft;
+
+	unified_ft.LowPart  = ft->dwLowDateTime;
+	unified_ft.HighPart = ft->dwHighDateTime;
+
+	if (unified_ft.QuadPart < EpochShift)
+		return -1;
+
+	unified_ft.QuadPart -= EpochShift;
+	unified_ft.QuadPart /= 10 * 1000 * 1000;
+
+	return ((__int64) unified_ft.HighPart) << 32 |
+		   (__int64) unified_ft.LowPart;
+}
+
+static unsigned short
+cvt_attr2uxmode(int attr, const _TCHAR * name)
+{
+	unsigned short uxmode;
+	const _TCHAR * p;
+
+	uxmode = (unsigned short)((attr & FILE_ATTRIBUTE_DIRECTORY) ?
+			 (_S_IFDIR | _S_IEXEC) : (_S_IFREG));
+
+	uxmode |= (unsigned short)(attr & FILE_ATTRIBUTE_READONLY) ?
+			  (_S_IREAD) : (_S_IREAD | _S_IWRITE);
+
+	if (p = _tcsrchr(name, _T('.')))
+	{
+		if (! _tcsicmp(p, _T(".exe")) ||
+			! _tcsicmp(p, _T(".cmd")) ||
+			! _tcsicmp(p, _T(".bat")) ||
+			! _tcsicmp(p, _T(".com")))
+			uxmode |= _S_IEXEC;
+	}
+
+	uxmode |= (uxmode & 0700) >> 3;
+	uxmode |= (uxmode & 0700) >> 6;
+
+	return uxmode;
+}
+
+int
+_pgstat64(char const *name, struct stat *buf)
+{
+	WIN32_FILE_ATTRIBUTE_DATA faData;
+
+	if (NULL == name || NULL == buf)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (!GetFileAttributesEx(name, GetFileExInfoStandard, & faData))
+	{
+		DWORD		error = GetLastError();
+		if (error== ERROR_DELETE_PENDING)
+		{
+			/*
+			 * File has been deleted, but is not gone from the filesystem yet.
+			 * This can happen when some process with FILE_SHARE_DELETE has it
+			 * open and it will be fully removed once that handle is closed.
+			 * Meanwhile, we can't open it, so indicate that the file just
+			 * doesn't exist.
+			 */
+			errno = ENOENT;
+		}
+		_dosmaperr(error);
+		return -1;
+	}
+
+	memset(buf, 0, sizeof(* buf));
+
+	if (faData.ftLastWriteTime.dwLowDateTime ||
+		faData.ftLastWriteTime.dwHighDateTime)
+		buf->st_mtime = cvt_ft2ut( & faData.ftLastWriteTime );
+
+	if (faData.ftLastAccessTime.dwLowDateTime ||
+		faData.ftLastAccessTime.dwHighDateTime)
+		buf->st_atime = cvt_ft2ut(& faData.ftLastAccessTime);
+	else
+		buf->st_atime = buf->st_mtime;
+
+	if (faData.ftCreationTime.dwLowDateTime ||
+		faData.ftCreationTime.dwHighDateTime)
+		buf->st_ctime = cvt_ft2ut(& faData.ftCreationTime);
+	else
+		buf->st_ctime = buf->st_mtime;
+
+	buf->st_mode  = cvt_attr2uxmode(faData.dwFileAttributes, name);
+	buf->st_nlink = 1;
+
+	buf->st_size = ((__int64) faData.nFileSizeHigh) << 32 |
+				   (__int64)(faData.nFileSizeLow);
+
+	return 0;
+}
+
+int
+_pgfstat64(int fileno, struct stat *buf)
+{
+	const char filepath[MAX_PATH];
+	FILE_NAME_INFO nameInfo;
+
+	if (GetFileInformationByHandleEx((HANDLE) _get_osfhandle(fileno), 
+									 FileNameInfo,
+									 &nameInfo,
+									 sizeof(nameInfo)))
+	{
+		sprintf(filepath, "%ws", nameInfo.FileName);
+		return _pgstat64(filepath, buf);
+	}
+	else
+		return -1;
+}
+
+#endif /* WIN32 */
-- 
2.11.0

From 028a5af1c1f392af98102bd7a403df51e19d78fc Mon Sep 17 00:00:00 2001
From: Juan Jose Santamaria Flecha <juanjo.santamaria@gmail.com>
Date: Fri, 28 Jun 2019 03:53:44 -0400
Subject: [PATCH] WIP support for large files on Win32 . Workaround for Windows
 <sys/stat.h> shortcomings, reimplement fstat()/stat() on top of
 GetFileAttributesEx() and use 64 bits struct stat.

---
 configure                     |  11 +++
 src/include/port/win32_port.h |  35 +++++++---
 src/port/dirmod.c             |  52 --------------
 src/port/win32_stat.c         | 154 ++++++++++++++++++++++++++++++++++++++++++
 src/tools/msvc/Mkvcbuild.pm   |   2 +-
 5 files changed, 193 insertions(+), 61 deletions(-)
 create mode 100644 src/port/win32_stat.c

diff --git a/configure b/configure
index 8d47071..4bcec22 100755
--- a/configure
+++ b/configure
@@ -16204,6 +16204,12 @@ fi
 esac
 
   case " $LIBOBJS " in
+  *" win32_stat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS win32_stat.$ac_objext"
+ ;;
+esac
+
+  case " $LIBOBJS " in
   *" kill.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS kill.$ac_objext"
  ;;
@@ -16282,6 +16288,11 @@ if test "$PORTNAME" = "cygwin"; then
  ;;
 esac
 
+  case " $LIBOBJS " in
+  *" win32_stat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS win32_stat.$ac_objext"
+ ;;
+esac
 fi
 
 ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index f4841fb..d84e2d8 100644
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -52,7 +52,12 @@
 #include <direct.h>
 #include <sys/utime.h>			/* for non-unicode version */
 #undef near
-#include <sys/stat.h>			/* needed before sys/stat hacking below */
+/* needed before sys/stat hacking below */
+#define fstat microsoft_native_fstat
+#define stat microsoft_native_stat
+#include <sys/stat.h>
+#undef fstat
+#undef stat
 
 /* Must be here to avoid conflicting with prototype in windows.h */
 #define mkdir(a,b)	mkdir(a)
@@ -254,15 +259,29 @@ typedef int pid_t;
 
 /*
  * stat() is not guaranteed to set the st_size field on win32, so we
- * redefine it to our own implementation that is.
+ * redefine it to our own implementation. See src/port/win32_stat.c
  *
- * Some frontends don't need the size from stat, so if UNSAFE_STAT_OK
- * is defined we don't bother with this.
+ * The struct stat is 32 bit in MSVC so we redefine it as a copy of struct
+ * _stat64. This also fixes the struct size across Cygwin and MINGW builds.
  */
-#ifndef UNSAFE_STAT_OK
-extern int	pgwin32_safestat(const char *path, struct stat *buf);
-#define stat(a,b) pgwin32_safestat(a,b)
-#endif
+struct stat                     /* It is actually _stat64 */
+{
+	_dev_t         st_dev;
+	_ino_t         st_ino;
+	unsigned short st_mode;
+	short          st_nlink;
+	short          st_uid;
+	short          st_gid;
+	_dev_t         st_rdev;
+	__int64        st_size;
+	__time64_t     st_atime;
+	__time64_t     st_mtime;
+	__time64_t     st_ctime;
+};
+extern int _pgfstat64(int fileno, struct stat *buf);
+extern int _pgstat64(char const *name, struct stat *buf);
+#define fstat(fileno, sb) _pgfstat64(fileno, sb)
+#define stat(path, sb) _pgstat64(path, sb)
 
 /* These macros are not provided by older MinGW, nor by MSVC */
 #ifndef S_IRUSR
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index d793240..ec4b47f 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -353,55 +353,3 @@ pgwin32_is_junction(const char *path)
 	return ((attr & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT);
 }
 #endif							/* defined(WIN32) && !defined(__CYGWIN__) */
-
-
-#if defined(WIN32) && !defined(__CYGWIN__)
-
-#undef stat
-
-/*
- * The stat() function in win32 is not guaranteed to update the st_size
- * field when run. So we define our own version that uses the Win32 API
- * to update this field.
- */
-int
-pgwin32_safestat(const char *path, struct stat *buf)
-{
-	int			r;
-	WIN32_FILE_ATTRIBUTE_DATA attr;
-
-	r = stat(path, buf);
-	if (r < 0)
-	{
-		if (GetLastError() == ERROR_DELETE_PENDING)
-		{
-			/*
-			 * File has been deleted, but is not gone from the filesystem yet.
-			 * This can happen when some process with FILE_SHARE_DELETE has it
-			 * open and it will be fully removed once that handle is closed.
-			 * Meanwhile, we can't open it, so indicate that the file just
-			 * doesn't exist.
-			 */
-			errno = ENOENT;
-			return -1;
-		}
-
-		return r;
-	}
-
-	if (!GetFileAttributesEx(path, GetFileExInfoStandard, &attr))
-	{
-		_dosmaperr(GetLastError());
-		return -1;
-	}
-
-	/*
-	 * XXX no support for large files here, but we don't do that in general on
-	 * Win32 yet.
-	 */
-	buf->st_size = attr.nFileSizeLow;
-
-	return 0;
-}
-
-#endif
diff --git a/src/port/win32_stat.c b/src/port/win32_stat.c
new file mode 100644
index 0000000..63fbf82
--- /dev/null
+++ b/src/port/win32_stat.c
@@ -0,0 +1,154 @@
+/*-------------------------------------------------------------------------
+ *
+ * win32_stat.c
+ *	  Replacements for <sys/stat.h> functions using GetFileAttributesEx on
+ *    Win32.
+ *
+ * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/port/win32_stat.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifdef WIN32
+
+#include "c.h"
+#include <tchar.h>
+#if defined(__CYGWIN__)
+#include <w32api/windows.h>
+#else
+#include <windows.h>
+#endif
+
+static const unsigned __int64 EpochShift = UINT64CONST(116444736000000000);
+
+/*
+ * Converts a FILETIME struct into a 64 bit time_t
+ */
+static __time64_t
+filetime_to_time(FILETIME const * ft)
+{
+	ULARGE_INTEGER unified_ft;
+
+	unified_ft.LowPart  = ft->dwLowDateTime;
+	unified_ft.HighPart = ft->dwHighDateTime;
+
+	if (unified_ft.QuadPart < EpochShift)
+		return -1;
+
+	unified_ft.QuadPart -= EpochShift;
+	unified_ft.QuadPart /= 10 * 1000 * 1000;
+
+	return ((__int64) unified_ft.HighPart) << 32 |
+		   (__int64) unified_ft.LowPart;
+}
+
+/*
+ * Converts WIN32 file attributes to unix mode
+ */
+static unsigned short
+fileattr_to_unixmode(int attr, const _TCHAR * name)
+{
+	unsigned short uxmode;
+	const _TCHAR * p;
+
+	uxmode = (unsigned short)((attr & FILE_ATTRIBUTE_DIRECTORY) ?
+			 (_S_IFDIR | _S_IEXEC) : (_S_IFREG));
+
+	uxmode |= (unsigned short)(attr & FILE_ATTRIBUTE_READONLY) ?
+			  (_S_IREAD) : (_S_IREAD | _S_IWRITE);
+
+	if (p = _tcsrchr(name, _T('.')))
+	{
+		if (! _tcsicmp(p, _T(".exe")) ||
+			! _tcsicmp(p, _T(".cmd")) ||
+			! _tcsicmp(p, _T(".bat")) ||
+			! _tcsicmp(p, _T(".com")))
+			uxmode |= _S_IEXEC;
+	}
+
+	uxmode |= (uxmode & 0700) >> 3;
+	uxmode |= (uxmode & 0700) >> 6;
+
+	return uxmode;
+}
+
+/*
+ * GetFileAttributesEx minimum supported version: Windows XP and
+ * Windows Server 2003
+ */
+int
+_pgstat64(char const *name, struct stat *buf)
+{
+	WIN32_FILE_ATTRIBUTE_DATA faData;
+
+	if (NULL == name || NULL == buf)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (!GetFileAttributesEx(name, GetFileExInfoStandard, &faData))
+	{
+		DWORD		error = GetLastError();
+		if (error== ERROR_DELETE_PENDING)
+		{
+			/*
+			 * File has been deleted, but is not gone from the filesystem yet.
+			 * This can happen when some process with FILE_SHARE_DELETE has it
+			 * open and it will be fully removed once that handle is closed.
+			 * Meanwhile, we can't open it, so indicate that the file just
+			 * doesn't exist.
+			 */
+			errno = ENOENT;
+		}
+		_dosmaperr(error);
+		return -1;
+	}
+
+	if (faData.ftLastWriteTime.dwLowDateTime ||
+		faData.ftLastWriteTime.dwHighDateTime)
+		buf->st_mtime = filetime_to_time(&faData.ftLastWriteTime);
+
+	if (faData.ftLastAccessTime.dwLowDateTime ||
+		faData.ftLastAccessTime.dwHighDateTime)
+		buf->st_atime = filetime_to_time(&faData.ftLastAccessTime);
+	else
+		buf->st_atime = buf->st_mtime;
+
+	if (faData.ftCreationTime.dwLowDateTime ||
+		faData.ftCreationTime.dwHighDateTime)
+		buf->st_ctime = filetime_to_time(&faData.ftCreationTime);
+	else
+		buf->st_ctime = buf->st_mtime;
+
+	buf->st_mode  = fileattr_to_unixmode(faData.dwFileAttributes, name);
+	buf->st_nlink = 1;
+
+	buf->st_size = ((__int64) faData.nFileSizeHigh) << 32 |
+				   (__int64)(faData.nFileSizeLow);
+
+	return 0;
+}
+
+/*
+ * Wrapper for _pgstat64
+ * GetFinalPathNameByHandle minimum supported version: Windows Vista and
+ * Windows Server 2008
+ */
+int
+_pgfstat64(int fileno, struct stat *buf)
+{
+	const char filepath[_MAX_PATH];
+
+	if(GetFinalPathNameByHandle((HANDLE)_get_osfhandle(fileno),
+								filepath, _MAX_PATH, VOLUME_NAME_DOS))
+		return _pgstat64(filepath, buf);
+	return -1;
+}
+
+#endif /* WIN32 */
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index e07e459..4a14b24 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -101,7 +101,7 @@ sub mkvcbuild
 	  pg_strong_random.c pgcheckdir.c pgmkdirp.c pgsleep.c pgstrcasecmp.c
 	  pqsignal.c mkdtemp.c qsort.c qsort_arg.c quotes.c system.c
 	  sprompt.c strerror.c tar.c thread.c
-	  win32env.c win32error.c win32security.c win32setlocale.c);
+	  win32env.c win32error.c win32security.c win32setlocale.c win32_stat.c);
 
 	push(@pgportfiles, 'rint.c') if ($vsVersion < '12.00');
 
-- 
2.11.0

From af1625f676e21d2777aa4be70893bf01dc08328d Mon Sep 17 00:00:00 2001
From: Juan Jose Santamaria Flecha <juanjo.santamaria@gmail.com>
Date: Wed, 4 Sep 2019 17:17:37 -0400
Subject: [PATCH] WIP support for large files on Win32 . Workaround for Windows
 <sys/stat.h> shortcomings, reimplement fstat()/stat() on top of
 GetFileInformationByHandle() and use 64 bits struct stat.

---
 configure                     |   6 +
 configure.in                  |   1 +
 src/include/port/win32_port.h |  40 +++++--
 src/port/dirmod.c             |  52 ---------
 src/port/win32_stat.c         | 258 ++++++++++++++++++++++++++++++++++++++++++
 src/tools/msvc/Mkvcbuild.pm   |   2 +-
 6 files changed, 294 insertions(+), 65 deletions(-)
 create mode 100644 src/port/win32_stat.c

diff --git a/configure b/configure
index f14709e..81271e5 100755
--- a/configure
+++ b/configure
@@ -16102,6 +16102,12 @@ fi
 esac
 
   case " $LIBOBJS " in
+  *" win32_stat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS win32_stat.$ac_objext"
+ ;;
+esac
+
+  case " $LIBOBJS " in
   *" kill.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS kill.$ac_objext"
  ;;
diff --git a/configure.in b/configure.in
index 805cf86..e260f2a 100644
--- a/configure.in
+++ b/configure.in
@@ -1770,6 +1770,7 @@ if test "$PORTNAME" = "win32"; then
   AC_CHECK_FUNCS(_configthreadlocale)
   AC_REPLACE_FUNCS(gettimeofday)
   AC_LIBOBJ(dirmod)
+  AC_LIBOBJ(win32_stat)
   AC_LIBOBJ(kill)
   AC_LIBOBJ(open)
   AC_LIBOBJ(system)
diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index 1cf166a..2e317b7 100644
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -52,7 +52,12 @@
 #include <direct.h>
 #include <sys/utime.h>			/* for non-unicode version */
 #undef near
-#include <sys/stat.h>			/* needed before sys/stat hacking below */
+/* needed before sys/stat hacking below */
+#define fstat microsoft_native_fstat
+#define stat microsoft_native_stat
+#include <sys/stat.h>
+#undef fstat
+#undef stat
 
 /* Must be here to avoid conflicting with prototype in windows.h */
 #define mkdir(a,b)	mkdir(a)
@@ -249,20 +254,31 @@ typedef int pid_t;
  * Supplement to <sys/stat.h>.
  *
  * We must pull in sys/stat.h before this part, else our overrides lose.
- */
-#define lstat(path, sb) stat(path, sb)
-
-/*
  * stat() is not guaranteed to set the st_size field on win32, so we
- * redefine it to our own implementation that is.
+ * redefine it to our own implementation. See src/port/win32_stat.c
  *
- * Some frontends don't need the size from stat, so if UNSAFE_STAT_OK
- * is defined we don't bother with this.
+ * The struct stat is 32 bit in MSVC so we redefine it as a copy of struct
+ * _stat64. This also fixes the struct size for MINGW builds.
  */
-#ifndef UNSAFE_STAT_OK
-extern int	pgwin32_safestat(const char *path, struct stat *buf);
-#define stat(a,b) pgwin32_safestat(a,b)
-#endif
+struct stat                     /* It is actually _stat64 */
+{
+	_dev_t         st_dev;
+	_ino_t         st_ino;
+	unsigned short st_mode;
+	short          st_nlink;
+	short          st_uid;
+	short          st_gid;
+	_dev_t         st_rdev;
+	__int64        st_size;
+	__time64_t     st_atime;
+	__time64_t     st_mtime;
+	__time64_t     st_ctime;
+};
+extern int _pgfstat64(int fileno, struct stat *buf);
+extern int _pgstat64(char const *name, struct stat *buf);
+#define fstat(fileno, sb) _pgfstat64(fileno, sb)
+#define stat(path, sb) _pgstat64(path, sb)
+#define lstat(path, sb) _pgstat64(path, sb)
 
 /* These macros are not provided by older MinGW, nor by MSVC */
 #ifndef S_IRUSR
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index d793240..ec4b47f 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -353,55 +353,3 @@ pgwin32_is_junction(const char *path)
 	return ((attr & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT);
 }
 #endif							/* defined(WIN32) && !defined(__CYGWIN__) */
-
-
-#if defined(WIN32) && !defined(__CYGWIN__)
-
-#undef stat
-
-/*
- * The stat() function in win32 is not guaranteed to update the st_size
- * field when run. So we define our own version that uses the Win32 API
- * to update this field.
- */
-int
-pgwin32_safestat(const char *path, struct stat *buf)
-{
-	int			r;
-	WIN32_FILE_ATTRIBUTE_DATA attr;
-
-	r = stat(path, buf);
-	if (r < 0)
-	{
-		if (GetLastError() == ERROR_DELETE_PENDING)
-		{
-			/*
-			 * File has been deleted, but is not gone from the filesystem yet.
-			 * This can happen when some process with FILE_SHARE_DELETE has it
-			 * open and it will be fully removed once that handle is closed.
-			 * Meanwhile, we can't open it, so indicate that the file just
-			 * doesn't exist.
-			 */
-			errno = ENOENT;
-			return -1;
-		}
-
-		return r;
-	}
-
-	if (!GetFileAttributesEx(path, GetFileExInfoStandard, &attr))
-	{
-		_dosmaperr(GetLastError());
-		return -1;
-	}
-
-	/*
-	 * XXX no support for large files here, but we don't do that in general on
-	 * Win32 yet.
-	 */
-	buf->st_size = attr.nFileSizeLow;
-
-	return 0;
-}
-
-#endif
diff --git a/src/port/win32_stat.c b/src/port/win32_stat.c
new file mode 100644
index 0000000..b2dcea4
--- /dev/null
+++ b/src/port/win32_stat.c
@@ -0,0 +1,258 @@
+/*-------------------------------------------------------------------------
+ *
+ * win32_stat.c
+ *	  Replacements for <sys/stat.h> functions using GetFileInformationByHandle
+ *    on Win32.
+ *
+ * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/port/win32_stat.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifdef WIN32
+
+#include "c.h"
+#include <windows.h>
+/*
+ * NtQueryInformationFile is used when the Windows version is older than
+ * Vista / Server 2008. We load it from the ntdll library.
+ */
+#if _WIN32_WINNT < 0x0600
+#include <winternl.h>
+#endif
+
+static const unsigned __int64 EpochShift = UINT64CONST(116444736000000000);
+
+/*
+ * Converts a FILETIME struct into a 64 bit time_t.
+ */
+static __time64_t
+filetime_to_time(FILETIME const *ft)
+{
+	ULARGE_INTEGER unified_ft = { 0 };
+
+	unified_ft.LowPart  = ft->dwLowDateTime;
+	unified_ft.HighPart = ft->dwHighDateTime;
+
+	if (unified_ft.QuadPart < EpochShift)
+		return -1;
+
+	unified_ft.QuadPart -= EpochShift;
+	unified_ft.QuadPart /= 10 * 1000 * 1000;
+
+	return unified_ft.QuadPart;
+}
+
+/*
+ * Converts WIN32 file attributes to unix mode.
+ * Only owner permissions are set.
+ */
+static unsigned short
+fileattr_to_unixmode(int attr)
+{
+	unsigned short uxmode = 0;
+
+	uxmode |= (unsigned short)((attr & FILE_ATTRIBUTE_DIRECTORY) ?
+			 (_S_IFDIR) : (_S_IFREG));
+
+	uxmode |= (unsigned short)(attr & FILE_ATTRIBUTE_READONLY) ?
+			  (_S_IREAD) : (_S_IREAD | _S_IWRITE);
+
+	/* We could simulate _S_IEXEC with CMD's PATHEXT extensions, unnecessary */
+	uxmode |= _S_IEXEC;
+
+	return uxmode;
+}
+
+/*
+ * Converts WIN32 file infomation to struct stat.
+ * GetFileInformationByHandle minimum supported version: Windows XP and
+ * Windows Server 2003.
+ */
+static int
+fileinfo_to_stat(HANDLE hFile, struct stat *buf)
+{
+	BY_HANDLE_FILE_INFORMATION fiData;
+
+	if (!GetFileInformationByHandle(hFile, &fiData))
+	{
+		errno = ENOENT;
+		return -1;
+	}
+
+	memset(buf, 0, sizeof(*buf));
+	if (fiData.ftLastWriteTime.dwLowDateTime || fiData.ftLastWriteTime.dwHighDateTime)
+		buf->st_mtime = filetime_to_time(&fiData.ftLastWriteTime);
+
+	if (fiData.ftLastAccessTime.dwLowDateTime || fiData.ftLastAccessTime.dwHighDateTime)
+		buf->st_atime = filetime_to_time(&fiData.ftLastAccessTime);
+	else
+		buf->st_atime = buf->st_mtime;
+
+	if (fiData.ftCreationTime.dwLowDateTime || fiData.ftCreationTime.dwHighDateTime)
+		buf->st_ctime = filetime_to_time(&fiData.ftCreationTime);
+	else
+		buf->st_ctime = buf->st_mtime;
+
+	buf->st_mode  = fileattr_to_unixmode(fiData.dwFileAttributes);
+	buf->st_nlink = fiData.nNumberOfLinks;
+
+	buf->st_size = ((__int64) fiData.nFileSizeHigh) << 32 |
+				   (__int64)(fiData.nFileSizeLow);
+	return 0;
+}
+
+#if _WIN32_WINNT < 0x0600
+#if !defined(__MINGW64_VERSION_MAJOR)
+/* MinGW includes this in <winternl.h>, but is missing in MSVC */
+typedef struct _FILE_STANDARD_INFORMATION
+{
+	LARGE_INTEGER AllocationSize;
+	LARGE_INTEGER EndOfFile;
+	ULONG         NumberOfLinks;
+	BOOLEAN       DeletePending;
+	BOOLEAN       Directory;
+} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION;
+#define FileStandardInformation 5
+#endif /* !defined(__MINGW64_VERSION_MAJOR) */
+
+typedef NTSTATUS (NTAPI *PFN_NTQUERYINFORMATIONFILE)
+(
+	IN HANDLE FileHandle,
+	OUT PIO_STATUS_BLOCK IoStatusBlock,
+	OUT PVOID FileInformation,
+	IN ULONG Length,
+	IN FILE_INFORMATION_CLASS FileInformationClass
+);
+static PFN_NTQUERYINFORMATIONFILE _NtQueryInformationFile = NULL;
+
+/*
+ * Load DLL file just once regardless of how many functions
+ * we load/call in it.
+ */
+static HMODULE ntdll = NULL;
+
+static void
+LoadNtdll()
+{
+	if (ntdll != NULL)
+		return;
+	ntdll = LoadLibraryEx("ntdll.dll", NULL, 0);
+}
+#endif /* _WIN32_WINNT < 0x0600 */
+
+/*
+ * We must use a handle so lstat() returns the information of the target file.
+ * As a reliable test for ERROR_DELETE_PENDING we use NtQueryInformationFile
+ * from Windows 2000 or GetFileInformationByHandleEx from Server 2008 / Vista
+ */
+int
+_pgstat64(char const *name, struct stat *buf)
+{
+	SECURITY_ATTRIBUTES sa;
+	HANDLE hFile;
+	int		ret;
+#if _WIN32_WINNT < 0x0600
+	IO_STATUS_BLOCK ioStatus;
+	FILE_STANDARD_INFORMATION standardInfo;
+#else
+	FILE_STANDARD_INFO standardInfo;
+#endif
+
+	if (NULL == name || NULL == buf)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+
+	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+	sa.bInheritHandle = TRUE;
+	sa.lpSecurityDescriptor = NULL;
+	hFile = CreateFile(name, GENERIC_READ, (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE),
+					   &sa, OPEN_EXISTING,
+					   FILE_FLAG_NO_BUFFERING | FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED,
+					   NULL);
+	if (hFile == INVALID_HANDLE_VALUE)
+	{
+		CloseHandle(hFile);
+		errno = ENOENT;
+		return -1;
+	}
+
+#if _WIN32_WINNT < 0x0600
+	if (_NtQueryInformationFile == NULL)
+	{
+		LoadNtdll();
+		if(ntdll == NULL)
+		{
+			_dosmaperr(GetLastError());
+			CloseHandle(hFile);
+			/* Do not return ENOENT */
+			errno = ENOMSG;
+			return -1;
+		}
+
+		_NtQueryInformationFile = (PFN_NTQUERYINFORMATIONFILE)
+			GetProcAddress(ntdll, "NtQueryInformationFile");
+		if (_NtQueryInformationFile == NULL)
+		{
+			_dosmaperr(GetLastError());
+			CloseHandle(hFile);
+			errno = ENOMSG;
+			return -1;
+		}
+	}
+
+	memset(&standardInfo, 0, sizeof(standardInfo));
+	if (!NT_SUCCESS(_NtQueryInformationFile(hFile, &ioStatus, &standardInfo, sizeof(standardInfo),
+		FileStandardInformation)))
+#else
+	if (!GetFileInformationByHandleEx(hFile, FileStandardInfo, &standardInfo, sizeof(standardInfo)))
+#endif /* _WIN32_WINNT < 0x0600 */
+	{
+		CloseHandle(hFile);
+		errno = ENOENT;
+		return -1;
+	}
+	if (standardInfo.DeletePending)
+	{
+		/*
+		 * File has been deleted, but is not gone from the filesystem yet.
+		 * This can happen when some process with FILE_SHARE_DELETE has it
+		 * open and it will be fully removed once that handle is closed.
+		 * Meanwhile, we can't open it, so indicate that the file just
+		 * doesn't exist.
+		 */
+		DWORD error = ERROR_DELETE_PENDING;
+		_dosmaperr(error);
+		CloseHandle(hFile);
+		errno = ENOENT;
+		return -1;
+	}
+
+	ret = fileinfo_to_stat(hFile, buf);
+	CloseHandle(hFile);
+	return ret;
+}
+
+/* Shares _pgstat64() logic */
+int
+_pgfstat64(int fileno, struct stat *buf)
+{
+	HANDLE hFile = (HANDLE)_get_osfhandle(fileno);
+
+	if (INVALID_HANDLE_VALUE == hFile || NULL == buf)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+
+	return fileinfo_to_stat(hFile, buf);
+}
+
+#endif /* WIN32 */
\ No newline at end of file
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 2eab635..b2bf321 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -101,7 +101,7 @@ sub mkvcbuild
 	  pg_strong_random.c pgcheckdir.c pgmkdirp.c pgsleep.c pgstrcasecmp.c
 	  pqsignal.c mkdtemp.c qsort.c qsort_arg.c quotes.c system.c
 	  sprompt.c strerror.c tar.c thread.c
-	  win32env.c win32error.c win32security.c win32setlocale.c);
+	  win32env.c win32error.c win32security.c win32setlocale.c win32_stat.c);
 
 	push(@pgportfiles, 'rint.c') if ($vsVersion < '12.00');
 
-- 
2.11.0

From 028000a85531190f2028985397a1f050a42e9a0b Mon Sep 17 00:00:00 2001
From: Juan Jose Santamaria Flecha <juanjo.santamaria@gmail.com>
Date: Fri, 28 Feb 2020 04:08:58 -0500
Subject: [PATCH] Support for large files on Win32. Workaround for Windows
 <sys/stat.h> shortcomings, reimplement fstat()/stat() on top of
 GetFileInformationByHandle() and use 64 bits struct stat.

---
 configure                     |   6 +
 configure.in                  |   1 +
 src/include/port/win32_port.h |  41 +++++--
 src/port/dirmod.c             |  52 ---------
 src/port/win32stat.c          | 254 ++++++++++++++++++++++++++++++++++++++++++
 src/tools/msvc/Mkvcbuild.pm   |   2 +-
 6 files changed, 291 insertions(+), 65 deletions(-)
 create mode 100644 src/port/win32stat.c

diff --git a/configure b/configure
index d2c74e5..3acea3f 100755
--- a/configure
+++ b/configure
@@ -15822,6 +15822,12 @@ esac
  ;;
 esac
 
+  case " $LIBOBJS " in
+  *" win32stat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS win32stat.$ac_objext"
+ ;;
+esac
+
 
 $as_echo "#define HAVE_SYMLINK 1" >>confdefs.h
 
diff --git a/configure.in b/configure.in
index 0b0a871..f9c73f6 100644
--- a/configure.in
+++ b/configure.in
@@ -1772,6 +1772,7 @@ if test "$PORTNAME" = "win32"; then
   AC_LIBOBJ(win32error)
   AC_LIBOBJ(win32security)
   AC_LIBOBJ(win32setlocale)
+  AC_LIBOBJ(win32stat)
   AC_DEFINE([HAVE_SYMLINK], 1,
             [Define to 1 if you have the `symlink' function.])
   AC_CHECK_TYPES(MINIDUMP_TYPE, [pgac_minidump_type=yes], [pgac_minidump_type=no], [
diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index 8b6576b..cca7cdd 100644
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -51,7 +51,12 @@
 #include <signal.h>
 #include <direct.h>
 #undef near
-#include <sys/stat.h>			/* needed before sys/stat hacking below */
+/* needed before sys/stat hacking below */
+#define fstat microsoft_native_fstat
+#define stat microsoft_native_stat
+#include <sys/stat.h>
+#undef fstat
+#undef stat
 
 /* Must be here to avoid conflicting with prototype in windows.h */
 #define mkdir(a,b)	mkdir(a)
@@ -240,20 +245,32 @@ typedef int pid_t;
  * Supplement to <sys/stat.h>.
  *
  * We must pull in sys/stat.h before this part, else our overrides lose.
- */
-#define lstat(path, sb) stat(path, sb)
-
-/*
+ *
  * stat() is not guaranteed to set the st_size field on win32, so we
- * redefine it to our own implementation that is.
+ * redefine it to our own implementation. See src/port/win32stat.c.
  *
- * Some frontends don't need the size from stat, so if UNSAFE_STAT_OK
- * is defined we don't bother with this.
+ * The struct stat is 32 bit in MSVC, so we redefine it as a copy of
+ * struct _stat64. This also fixes the struct size for MINGW builds.
  */
-#ifndef UNSAFE_STAT_OK
-extern int	pgwin32_safestat(const char *path, struct stat *buf);
-#define stat(a,b) pgwin32_safestat(a,b)
-#endif
+struct stat                     /* It is actually _stat64 */
+{
+   _dev_t         st_dev;
+   _ino_t         st_ino;
+   unsigned short st_mode;
+   short          st_nlink;
+   short          st_uid;
+   short          st_gid;
+   _dev_t         st_rdev;
+   __int64        st_size;
+   __time64_t     st_atime;
+   __time64_t     st_mtime;
+   __time64_t     st_ctime;
+};
+extern int _pgfstat64(int fileno, struct stat *buf);
+extern int _pgstat64(const char *name, struct stat *buf);
+#define fstat(fileno, sb) _pgfstat64(fileno, sb)
+#define stat(path, sb) _pgstat64(path, sb)
+#define lstat(path, sb) _pgstat64(path, sb)
 
 /* These macros are not provided by older MinGW, nor by MSVC */
 #ifndef S_IRUSR
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index e22a41c..8979f10 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -353,55 +353,3 @@ pgwin32_is_junction(const char *path)
 	return ((attr & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT);
 }
 #endif							/* defined(WIN32) && !defined(__CYGWIN__) */
-
-
-#if defined(WIN32) && !defined(__CYGWIN__)
-
-#undef stat
-
-/*
- * The stat() function in win32 is not guaranteed to update the st_size
- * field when run. So we define our own version that uses the Win32 API
- * to update this field.
- */
-int
-pgwin32_safestat(const char *path, struct stat *buf)
-{
-	int			r;
-	WIN32_FILE_ATTRIBUTE_DATA attr;
-
-	r = stat(path, buf);
-	if (r < 0)
-	{
-		if (GetLastError() == ERROR_DELETE_PENDING)
-		{
-			/*
-			 * File has been deleted, but is not gone from the filesystem yet.
-			 * This can happen when some process with FILE_SHARE_DELETE has it
-			 * open and it will be fully removed once that handle is closed.
-			 * Meanwhile, we can't open it, so indicate that the file just
-			 * doesn't exist.
-			 */
-			errno = ENOENT;
-			return -1;
-		}
-
-		return r;
-	}
-
-	if (!GetFileAttributesEx(path, GetFileExInfoStandard, &attr))
-	{
-		_dosmaperr(GetLastError());
-		return -1;
-	}
-
-	/*
-	 * XXX no support for large files here, but we don't do that in general on
-	 * Win32 yet.
-	 */
-	buf->st_size = attr.nFileSizeLow;
-
-	return 0;
-}
-
-#endif
diff --git a/src/port/win32stat.c b/src/port/win32stat.c
new file mode 100644
index 0000000..a607797
--- /dev/null
+++ b/src/port/win32stat.c
@@ -0,0 +1,254 @@
+/*-------------------------------------------------------------------------
+ *
+ * win32stat.c
+ *	  Replacements for <sys/stat.h> functions using GetFileInformationByHandle
+ *    on Win32.
+ *
+ * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/port/win32stat.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifdef WIN32
+
+#include "c.h"
+#include <windows.h>
+
+/*
+ * In order to support MinGW we use NtQueryInformationFile as an alternative
+ * for GetFileInformationByHandleEx. It is loaded from the ntdll library.
+ */
+#if _WIN32_WINNT < 0x0600
+#include <winternl.h>
+
+typedef NTSTATUS (NTAPI *PFN_NTQUERYINFORMATIONFILE)
+(
+	IN HANDLE FileHandle,
+	OUT PIO_STATUS_BLOCK IoStatusBlock,
+	OUT PVOID FileInformation,
+	IN ULONG Length,
+	IN FILE_INFORMATION_CLASS FileInformationClass
+);
+
+static PFN_NTQUERYINFORMATIONFILE _NtQueryInformationFile = NULL;
+
+/*
+ * Load DLL file just once regardless of how many functions we load/call in it.
+ */
+static HMODULE ntdll = NULL;
+
+static void
+LoadNtdll(void)
+{
+	if (ntdll != NULL)
+		return;
+	ntdll = LoadLibraryEx("ntdll.dll", NULL, 0);
+}
+#endif /* _WIN32_WINNT < 0x0600 */
+
+static const unsigned __int64 EpochShift = UINT64CONST(116444736000000000);
+
+/*
+ * Converts a FILETIME struct into a 64 bit time_t.
+ */
+static __time64_t
+filetime_to_time(FILETIME const *ft)
+{
+	ULARGE_INTEGER unified_ft = {0};
+
+	unified_ft.LowPart  = ft->dwLowDateTime;
+	unified_ft.HighPart = ft->dwHighDateTime;
+
+	if (unified_ft.QuadPart < EpochShift)
+		return -1;
+
+	unified_ft.QuadPart -= EpochShift;
+	unified_ft.QuadPart /= 10 * 1000 * 1000;
+
+	return unified_ft.QuadPart;
+}
+
+/*
+ * Converts WIN32 file attributes to unix mode.
+ * Only owner permissions are set.
+ */
+static unsigned short
+fileattr_to_unixmode(int attr)
+{
+	unsigned short uxmode = 0;
+
+	uxmode |= (unsigned short)((attr & FILE_ATTRIBUTE_DIRECTORY) ?
+			 (_S_IFDIR) : (_S_IFREG));
+
+	uxmode |= (unsigned short)(attr & FILE_ATTRIBUTE_READONLY) ?
+			  (_S_IREAD) : (_S_IREAD | _S_IWRITE);
+
+	/* There is no need to simulate _S_IEXEC using CMD's PATHEXT extensions */
+	uxmode |= _S_IEXEC;
+
+	return uxmode;
+}
+
+/*
+ * Converts WIN32 file infomation to struct stat.
+ * GetFileInformationByHandle minimum supported version: Windows XP and
+ * Windows Server 2003.
+ */
+static int
+fileinfo_to_stat(HANDLE hFile, struct stat *buf)
+{
+	BY_HANDLE_FILE_INFORMATION fiData;
+
+	if (!GetFileInformationByHandle(hFile, &fiData))
+	{
+		 _dosmaperr(GetLastError());
+		return -1;
+	}
+
+	memset(buf, 0, sizeof(*buf));
+	if (fiData.ftLastWriteTime.dwLowDateTime ||
+		fiData.ftLastWriteTime.dwHighDateTime)
+		buf->st_mtime = filetime_to_time(&fiData.ftLastWriteTime);
+
+	if (fiData.ftLastAccessTime.dwLowDateTime ||
+		fiData.ftLastAccessTime.dwHighDateTime)
+		buf->st_atime = filetime_to_time(&fiData.ftLastAccessTime);
+	else
+		buf->st_atime = buf->st_mtime;
+
+	if (fiData.ftCreationTime.dwLowDateTime ||
+		fiData.ftCreationTime.dwHighDateTime)
+		buf->st_ctime = filetime_to_time(&fiData.ftCreationTime);
+	else
+		buf->st_ctime = buf->st_mtime;
+
+	buf->st_mode  = fileattr_to_unixmode(fiData.dwFileAttributes);
+	buf->st_nlink = fiData.nNumberOfLinks;
+
+	buf->st_size = ((__int64) fiData.nFileSizeHigh) << 32 |
+				   (__int64)(fiData.nFileSizeLow);
+	return 0;
+}
+
+/*
+ * We must use a handle so lstat() returns the information of the target file.
+ * As a reliable test for ERROR_DELETE_PENDING we use NtQueryInformationFile
+ * from Windows 2000 or GetFileInformationByHandleEx from Server 2008 / Vista.
+ */
+int
+_pgstat64(const char *name, struct stat *buf)
+{
+	SECURITY_ATTRIBUTES sa;
+	HANDLE hFile;
+	int		ret;
+#if _WIN32_WINNT < 0x0600
+	IO_STATUS_BLOCK ioStatus;
+	FILE_STANDARD_INFORMATION standardInfo;
+#else
+	FILE_STANDARD_INFO standardInfo;
+#endif
+
+	if (name == NULL || buf == NULL)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+	/* fast not exists */
+	if (GetFileAttributes(name) == INVALID_FILE_ATTRIBUTES)
+	{
+		errno = ENOENT;
+		return -1;
+	}
+
+	/* Get a file handle as lightweight as we can */
+	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+	sa.bInheritHandle = TRUE;
+	sa.lpSecurityDescriptor = NULL;
+	hFile = CreateFile(name, GENERIC_READ,
+					   (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE),
+					   &sa, OPEN_EXISTING,
+					   (FILE_FLAG_NO_BUFFERING | FILE_FLAG_BACKUP_SEMANTICS |
+					   FILE_FLAG_OVERLAPPED), NULL);
+	if (hFile == INVALID_HANDLE_VALUE)
+	{
+		CloseHandle(hFile);
+		errno = ENOENT;
+		return -1;
+	}
+
+	memset(&standardInfo, 0, sizeof(standardInfo));
+#if _WIN32_WINNT < 0x0600
+	if (_NtQueryInformationFile == NULL)
+	{
+		LoadNtdll();
+		if(ntdll == NULL)
+		{
+			_dosmaperr(GetLastError());
+			CloseHandle(hFile);
+			return -1;
+		}
+
+		_NtQueryInformationFile = (PFN_NTQUERYINFORMATIONFILE)
+			GetProcAddress(ntdll, "NtQueryInformationFile");
+		if (_NtQueryInformationFile == NULL)
+		{
+			_dosmaperr(GetLastError());
+			CloseHandle(hFile);
+			return -1;
+		}
+	}
+
+	if (!NT_SUCCESS(_NtQueryInformationFile(hFile, &ioStatus, &standardInfo,
+		sizeof(standardInfo), FileStandardInformation)))
+#else
+	if (!GetFileInformationByHandleEx(hFile, FileStandardInfo, &standardInfo,
+		sizeof(standardInfo)))
+#endif /* _WIN32_WINNT < 0x0600 */
+	{
+		 _dosmaperr(GetLastError());
+		CloseHandle(hFile);
+		return -1;
+	}
+	if (standardInfo.DeletePending)
+	{
+		/*
+		 * File has been deleted, but is not gone from the filesystem yet.
+		 * This can happen when some process with FILE_SHARE_DELETE has it
+		 * open and it will be fully removed once that handle is closed.
+		 * Meanwhile, we can't open it, so indicate that the file just
+		 * doesn't exist.
+		 */
+		CloseHandle(hFile);
+		errno = ENOENT;
+		return -1;
+	}
+
+	ret = fileinfo_to_stat(hFile, buf);
+	CloseHandle(hFile);
+	return ret;
+}
+
+/*
+ * Since we already have a file handle there is no need to check for
+ * ERROR_DELETE_PENDING.
+ */
+int
+_pgfstat64(int fileno, struct stat *buf)
+{
+	HANDLE hFile = (HANDLE)_get_osfhandle(fileno);
+
+	if (hFile == INVALID_HANDLE_VALUE || buf == NULL)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+
+	return fileinfo_to_stat(hFile, buf);
+}
+
+#endif /* WIN32 */
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 834c2c3..6ff0783 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -103,7 +103,7 @@ sub mkvcbuild
 	  pg_strong_random.c pgcheckdir.c pgmkdirp.c pgsleep.c pgstrcasecmp.c
 	  pqsignal.c mkdtemp.c qsort.c qsort_arg.c quotes.c system.c
 	  sprompt.c strerror.c tar.c thread.c
-	  win32env.c win32error.c win32security.c win32setlocale.c);
+	  win32env.c win32error.c win32security.c win32setlocale.c win32stat.c);
 
 	push(@pgportfiles, 'strtof.c') if ($vsVersion < '14.00');
 
-- 
2.11.0

From ca3d2cc8d86b64b4863448ba45bd8386d4d49d04 Mon Sep 17 00:00:00 2001
From: Juan Jose Santamaria Flecha <juanjo.santamaria@gmail.com>
Date: Fri, 28 Feb 2020 19:22:35 -0500
Subject: [PATCH] Support for large files on Win32. Workaround for Windows
 <sys/stat.h> shortcomings, reimplement fstat()/stat() on top of
 GetFileInformationByHandle() and use 64 bits struct stat.

---
 configure                     |   6 +
 configure.in                  |   1 +
 src/include/port/win32_port.h |  41 +++++--
 src/port/dirmod.c             |  52 ---------
 src/port/win32stat.c          | 254 ++++++++++++++++++++++++++++++++++++++++++
 src/tools/msvc/Mkvcbuild.pm   |   2 +-
 6 files changed, 291 insertions(+), 65 deletions(-)
 create mode 100644 src/port/win32stat.c

diff --git a/configure b/configure
index d2c74e5..3acea3f 100755
--- a/configure
+++ b/configure
@@ -15822,6 +15822,12 @@ esac
  ;;
 esac
 
+  case " $LIBOBJS " in
+  *" win32stat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS win32stat.$ac_objext"
+ ;;
+esac
+
 
 $as_echo "#define HAVE_SYMLINK 1" >>confdefs.h
 
diff --git a/configure.in b/configure.in
index 0b0a871..f9c73f6 100644
--- a/configure.in
+++ b/configure.in
@@ -1772,6 +1772,7 @@ if test "$PORTNAME" = "win32"; then
   AC_LIBOBJ(win32error)
   AC_LIBOBJ(win32security)
   AC_LIBOBJ(win32setlocale)
+  AC_LIBOBJ(win32stat)
   AC_DEFINE([HAVE_SYMLINK], 1,
             [Define to 1 if you have the `symlink' function.])
   AC_CHECK_TYPES(MINIDUMP_TYPE, [pgac_minidump_type=yes], [pgac_minidump_type=no], [
diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index 8b6576b..cca7cdd 100644
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -51,7 +51,12 @@
 #include <signal.h>
 #include <direct.h>
 #undef near
-#include <sys/stat.h>			/* needed before sys/stat hacking below */
+/* needed before sys/stat hacking below */
+#define fstat microsoft_native_fstat
+#define stat microsoft_native_stat
+#include <sys/stat.h>
+#undef fstat
+#undef stat
 
 /* Must be here to avoid conflicting with prototype in windows.h */
 #define mkdir(a,b)	mkdir(a)
@@ -240,20 +245,32 @@ typedef int pid_t;
  * Supplement to <sys/stat.h>.
  *
  * We must pull in sys/stat.h before this part, else our overrides lose.
- */
-#define lstat(path, sb) stat(path, sb)
-
-/*
+ *
  * stat() is not guaranteed to set the st_size field on win32, so we
- * redefine it to our own implementation that is.
+ * redefine it to our own implementation. See src/port/win32stat.c.
  *
- * Some frontends don't need the size from stat, so if UNSAFE_STAT_OK
- * is defined we don't bother with this.
+ * The struct stat is 32 bit in MSVC, so we redefine it as a copy of
+ * struct _stat64. This also fixes the struct size for MINGW builds.
  */
-#ifndef UNSAFE_STAT_OK
-extern int	pgwin32_safestat(const char *path, struct stat *buf);
-#define stat(a,b) pgwin32_safestat(a,b)
-#endif
+struct stat                     /* It is actually _stat64 */
+{
+   _dev_t         st_dev;
+   _ino_t         st_ino;
+   unsigned short st_mode;
+   short          st_nlink;
+   short          st_uid;
+   short          st_gid;
+   _dev_t         st_rdev;
+   __int64        st_size;
+   __time64_t     st_atime;
+   __time64_t     st_mtime;
+   __time64_t     st_ctime;
+};
+extern int _pgfstat64(int fileno, struct stat *buf);
+extern int _pgstat64(const char *name, struct stat *buf);
+#define fstat(fileno, sb) _pgfstat64(fileno, sb)
+#define stat(path, sb) _pgstat64(path, sb)
+#define lstat(path, sb) _pgstat64(path, sb)
 
 /* These macros are not provided by older MinGW, nor by MSVC */
 #ifndef S_IRUSR
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index e22a41c..8979f10 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -353,55 +353,3 @@ pgwin32_is_junction(const char *path)
 	return ((attr & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT);
 }
 #endif							/* defined(WIN32) && !defined(__CYGWIN__) */
-
-
-#if defined(WIN32) && !defined(__CYGWIN__)
-
-#undef stat
-
-/*
- * The stat() function in win32 is not guaranteed to update the st_size
- * field when run. So we define our own version that uses the Win32 API
- * to update this field.
- */
-int
-pgwin32_safestat(const char *path, struct stat *buf)
-{
-	int			r;
-	WIN32_FILE_ATTRIBUTE_DATA attr;
-
-	r = stat(path, buf);
-	if (r < 0)
-	{
-		if (GetLastError() == ERROR_DELETE_PENDING)
-		{
-			/*
-			 * File has been deleted, but is not gone from the filesystem yet.
-			 * This can happen when some process with FILE_SHARE_DELETE has it
-			 * open and it will be fully removed once that handle is closed.
-			 * Meanwhile, we can't open it, so indicate that the file just
-			 * doesn't exist.
-			 */
-			errno = ENOENT;
-			return -1;
-		}
-
-		return r;
-	}
-
-	if (!GetFileAttributesEx(path, GetFileExInfoStandard, &attr))
-	{
-		_dosmaperr(GetLastError());
-		return -1;
-	}
-
-	/*
-	 * XXX no support for large files here, but we don't do that in general on
-	 * Win32 yet.
-	 */
-	buf->st_size = attr.nFileSizeLow;
-
-	return 0;
-}
-
-#endif
diff --git a/src/port/win32stat.c b/src/port/win32stat.c
new file mode 100644
index 0000000..0dcbe03
--- /dev/null
+++ b/src/port/win32stat.c
@@ -0,0 +1,254 @@
+/*-------------------------------------------------------------------------
+ *
+ * win32stat.c
+ *	  Replacements for <sys/stat.h> functions using GetFileInformationByHandle
+ *    on Win32.
+ *
+ * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/port/win32stat.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifdef WIN32
+
+#include "c.h"
+#include <windows.h>
+
+/*
+ * In order to support MinGW we use NtQueryInformationFile as an alternative
+ * for GetFileInformationByHandleEx. It is loaded from the ntdll library.
+ */
+#if defined(__MINGW32__) || defined(__MINGW64__)
+#include <winternl.h>
+
+typedef NTSTATUS (NTAPI *PFN_NTQUERYINFORMATIONFILE)
+(
+	IN HANDLE FileHandle,
+	OUT PIO_STATUS_BLOCK IoStatusBlock,
+	OUT PVOID FileInformation,
+	IN ULONG Length,
+	IN FILE_INFORMATION_CLASS FileInformationClass
+);
+
+static PFN_NTQUERYINFORMATIONFILE _NtQueryInformationFile = NULL;
+
+/*
+ * Load DLL file just once regardless of how many functions we load/call in it.
+ */
+static HMODULE ntdll = NULL;
+
+static void
+LoadNtdll(void)
+{
+	if (ntdll != NULL)
+		return;
+	ntdll = LoadLibraryEx("ntdll.dll", NULL, 0);
+}
+#endif /* defined(__MINGW32__) || defined(__MINGW64__) */
+
+static const unsigned __int64 EpochShift = UINT64CONST(116444736000000000);
+
+/*
+ * Converts a FILETIME struct into a 64 bit time_t.
+ */
+static __time64_t
+filetime_to_time(FILETIME const *ft)
+{
+	ULARGE_INTEGER unified_ft = {0};
+
+	unified_ft.LowPart  = ft->dwLowDateTime;
+	unified_ft.HighPart = ft->dwHighDateTime;
+
+	if (unified_ft.QuadPart < EpochShift)
+		return -1;
+
+	unified_ft.QuadPart -= EpochShift;
+	unified_ft.QuadPart /= 10 * 1000 * 1000;
+
+	return unified_ft.QuadPart;
+}
+
+/*
+ * Converts WIN32 file attributes to unix mode.
+ * Only owner permissions are set.
+ */
+static unsigned short
+fileattr_to_unixmode(int attr)
+{
+	unsigned short uxmode = 0;
+
+	uxmode |= (unsigned short)((attr & FILE_ATTRIBUTE_DIRECTORY) ?
+			 (_S_IFDIR) : (_S_IFREG));
+
+	uxmode |= (unsigned short)(attr & FILE_ATTRIBUTE_READONLY) ?
+			  (_S_IREAD) : (_S_IREAD | _S_IWRITE);
+
+	/* There is no need to simulate _S_IEXEC using CMD's PATHEXT extensions */
+	uxmode |= _S_IEXEC;
+
+	return uxmode;
+}
+
+/*
+ * Converts WIN32 file infomation to struct stat.
+ * GetFileInformationByHandle minimum supported version: Windows XP and
+ * Windows Server 2003.
+ */
+static int
+fileinfo_to_stat(HANDLE hFile, struct stat *buf)
+{
+	BY_HANDLE_FILE_INFORMATION fiData;
+
+	if (!GetFileInformationByHandle(hFile, &fiData))
+	{
+		 _dosmaperr(GetLastError());
+		return -1;
+	}
+
+	memset(buf, 0, sizeof(*buf));
+	if (fiData.ftLastWriteTime.dwLowDateTime ||
+		fiData.ftLastWriteTime.dwHighDateTime)
+		buf->st_mtime = filetime_to_time(&fiData.ftLastWriteTime);
+
+	if (fiData.ftLastAccessTime.dwLowDateTime ||
+		fiData.ftLastAccessTime.dwHighDateTime)
+		buf->st_atime = filetime_to_time(&fiData.ftLastAccessTime);
+	else
+		buf->st_atime = buf->st_mtime;
+
+	if (fiData.ftCreationTime.dwLowDateTime ||
+		fiData.ftCreationTime.dwHighDateTime)
+		buf->st_ctime = filetime_to_time(&fiData.ftCreationTime);
+	else
+		buf->st_ctime = buf->st_mtime;
+
+	buf->st_mode  = fileattr_to_unixmode(fiData.dwFileAttributes);
+	buf->st_nlink = fiData.nNumberOfLinks;
+
+	buf->st_size = ((__int64) fiData.nFileSizeHigh) << 32 |
+				   (__int64)(fiData.nFileSizeLow);
+	return 0;
+}
+
+/*
+ * We must use a handle so lstat() returns the information of the target file.
+ * As a reliable test for ERROR_DELETE_PENDING we use NtQueryInformationFile
+ * from Windows 2000 or GetFileInformationByHandleEx from Server 2008 / Vista.
+ */
+int
+_pgstat64(const char *name, struct stat *buf)
+{
+	SECURITY_ATTRIBUTES sa;
+	HANDLE hFile;
+	int		ret;
+#if defined(__MINGW32__) || defined(__MINGW64__)
+	IO_STATUS_BLOCK ioStatus;
+	FILE_STANDARD_INFORMATION standardInfo;
+#else
+	FILE_STANDARD_INFO standardInfo;
+#endif
+
+	if (name == NULL || buf == NULL)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+	/* fast not exists */
+	if (GetFileAttributes(name) == INVALID_FILE_ATTRIBUTES)
+	{
+		errno = ENOENT;
+		return -1;
+	}
+
+	/* Get a file handle as lightweight as we can */
+	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+	sa.bInheritHandle = TRUE;
+	sa.lpSecurityDescriptor = NULL;
+	hFile = CreateFile(name, GENERIC_READ,
+					   (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE),
+					   &sa, OPEN_EXISTING,
+					   (FILE_FLAG_NO_BUFFERING | FILE_FLAG_BACKUP_SEMANTICS |
+					   FILE_FLAG_OVERLAPPED), NULL);
+	if (hFile == INVALID_HANDLE_VALUE)
+	{
+		CloseHandle(hFile);
+		errno = ENOENT;
+		return -1;
+	}
+
+	memset(&standardInfo, 0, sizeof(standardInfo));
+#if defined(__MINGW32__) || defined(__MINGW64__)
+	if (_NtQueryInformationFile == NULL)
+	{
+		LoadNtdll();
+		if(ntdll == NULL)
+		{
+			_dosmaperr(GetLastError());
+			CloseHandle(hFile);
+			return -1;
+		}
+
+		_NtQueryInformationFile = (PFN_NTQUERYINFORMATIONFILE)
+			GetProcAddress(ntdll, "NtQueryInformationFile");
+		if (_NtQueryInformationFile == NULL)
+		{
+			_dosmaperr(GetLastError());
+			CloseHandle(hFile);
+			return -1;
+		}
+	}
+
+	if (!NT_SUCCESS(_NtQueryInformationFile(hFile, &ioStatus, &standardInfo,
+		sizeof(standardInfo), FileStandardInformation)))
+#else
+	if (!GetFileInformationByHandleEx(hFile, FileStandardInfo, &standardInfo,
+		sizeof(standardInfo)))
+#endif /* defined(__MINGW32__) || defined(__MINGW64__) */
+	{
+		 _dosmaperr(GetLastError());
+		CloseHandle(hFile);
+		return -1;
+	}
+	if (standardInfo.DeletePending)
+	{
+		/*
+		 * File has been deleted, but is not gone from the filesystem yet.
+		 * This can happen when some process with FILE_SHARE_DELETE has it
+		 * open and it will be fully removed once that handle is closed.
+		 * Meanwhile, we can't open it, so indicate that the file just
+		 * doesn't exist.
+		 */
+		CloseHandle(hFile);
+		errno = ENOENT;
+		return -1;
+	}
+
+	ret = fileinfo_to_stat(hFile, buf);
+	CloseHandle(hFile);
+	return ret;
+}
+
+/*
+ * Since we already have a file handle there is no need to check for
+ * ERROR_DELETE_PENDING.
+ */
+int
+_pgfstat64(int fileno, struct stat *buf)
+{
+	HANDLE hFile = (HANDLE)_get_osfhandle(fileno);
+
+	if (hFile == INVALID_HANDLE_VALUE || buf == NULL)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+
+	return fileinfo_to_stat(hFile, buf);
+}
+
+#endif /* WIN32 */
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 834c2c3..6ff0783 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -103,7 +103,7 @@ sub mkvcbuild
 	  pg_strong_random.c pgcheckdir.c pgmkdirp.c pgsleep.c pgstrcasecmp.c
 	  pqsignal.c mkdtemp.c qsort.c qsort_arg.c quotes.c system.c
 	  sprompt.c strerror.c tar.c thread.c
-	  win32env.c win32error.c win32security.c win32setlocale.c);
+	  win32env.c win32error.c win32security.c win32setlocale.c win32stat.c);
 
 	push(@pgportfiles, 'strtof.c') if ($vsVersion < '14.00');
 
-- 
2.11.0

From 30e074639076b30b4d10e7c62cf4603f23d5085b Mon Sep 17 00:00:00 2001
From: Juan Jose Santamaria Flecha <juanjo.santamaria@gmail.com>
Date: Sat, 29 Feb 2020 04:38:10 -0500
Subject: [PATCH] Support for large files on Win32. Workaround for Windows
 <sys/stat.h> shortcomings, reimplement fstat()/stat() on top of
 GetFileInformationByHandle() and use 64 bits struct stat.

---
 configure                     |   6 +
 configure.in                  |   1 +
 src/include/port/win32_port.h |  41 +++++--
 src/port/dirmod.c             |  52 --------
 src/port/win32stat.c          | 267 ++++++++++++++++++++++++++++++++++++++++++
 src/tools/msvc/Mkvcbuild.pm   |   2 +-
 6 files changed, 304 insertions(+), 65 deletions(-)
 create mode 100644 src/port/win32stat.c

diff --git a/configure b/configure
index d2c74e5..3acea3f 100755
--- a/configure
+++ b/configure
@@ -15822,6 +15822,12 @@ esac
  ;;
 esac
 
+  case " $LIBOBJS " in
+  *" win32stat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS win32stat.$ac_objext"
+ ;;
+esac
+
 
 $as_echo "#define HAVE_SYMLINK 1" >>confdefs.h
 
diff --git a/configure.in b/configure.in
index 0b0a871..f9c73f6 100644
--- a/configure.in
+++ b/configure.in
@@ -1772,6 +1772,7 @@ if test "$PORTNAME" = "win32"; then
   AC_LIBOBJ(win32error)
   AC_LIBOBJ(win32security)
   AC_LIBOBJ(win32setlocale)
+  AC_LIBOBJ(win32stat)
   AC_DEFINE([HAVE_SYMLINK], 1,
             [Define to 1 if you have the `symlink' function.])
   AC_CHECK_TYPES(MINIDUMP_TYPE, [pgac_minidump_type=yes], [pgac_minidump_type=no], [
diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index 8b6576b..cca7cdd 100644
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -51,7 +51,12 @@
 #include <signal.h>
 #include <direct.h>
 #undef near
-#include <sys/stat.h>			/* needed before sys/stat hacking below */
+/* needed before sys/stat hacking below */
+#define fstat microsoft_native_fstat
+#define stat microsoft_native_stat
+#include <sys/stat.h>
+#undef fstat
+#undef stat
 
 /* Must be here to avoid conflicting with prototype in windows.h */
 #define mkdir(a,b)	mkdir(a)
@@ -240,20 +245,32 @@ typedef int pid_t;
  * Supplement to <sys/stat.h>.
  *
  * We must pull in sys/stat.h before this part, else our overrides lose.
- */
-#define lstat(path, sb) stat(path, sb)
-
-/*
+ *
  * stat() is not guaranteed to set the st_size field on win32, so we
- * redefine it to our own implementation that is.
+ * redefine it to our own implementation. See src/port/win32stat.c.
  *
- * Some frontends don't need the size from stat, so if UNSAFE_STAT_OK
- * is defined we don't bother with this.
+ * The struct stat is 32 bit in MSVC, so we redefine it as a copy of
+ * struct _stat64. This also fixes the struct size for MINGW builds.
  */
-#ifndef UNSAFE_STAT_OK
-extern int	pgwin32_safestat(const char *path, struct stat *buf);
-#define stat(a,b) pgwin32_safestat(a,b)
-#endif
+struct stat                     /* It is actually _stat64 */
+{
+   _dev_t         st_dev;
+   _ino_t         st_ino;
+   unsigned short st_mode;
+   short          st_nlink;
+   short          st_uid;
+   short          st_gid;
+   _dev_t         st_rdev;
+   __int64        st_size;
+   __time64_t     st_atime;
+   __time64_t     st_mtime;
+   __time64_t     st_ctime;
+};
+extern int _pgfstat64(int fileno, struct stat *buf);
+extern int _pgstat64(const char *name, struct stat *buf);
+#define fstat(fileno, sb) _pgfstat64(fileno, sb)
+#define stat(path, sb) _pgstat64(path, sb)
+#define lstat(path, sb) _pgstat64(path, sb)
 
 /* These macros are not provided by older MinGW, nor by MSVC */
 #ifndef S_IRUSR
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index e22a41c..8979f10 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -353,55 +353,3 @@ pgwin32_is_junction(const char *path)
 	return ((attr & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT);
 }
 #endif							/* defined(WIN32) && !defined(__CYGWIN__) */
-
-
-#if defined(WIN32) && !defined(__CYGWIN__)
-
-#undef stat
-
-/*
- * The stat() function in win32 is not guaranteed to update the st_size
- * field when run. So we define our own version that uses the Win32 API
- * to update this field.
- */
-int
-pgwin32_safestat(const char *path, struct stat *buf)
-{
-	int			r;
-	WIN32_FILE_ATTRIBUTE_DATA attr;
-
-	r = stat(path, buf);
-	if (r < 0)
-	{
-		if (GetLastError() == ERROR_DELETE_PENDING)
-		{
-			/*
-			 * File has been deleted, but is not gone from the filesystem yet.
-			 * This can happen when some process with FILE_SHARE_DELETE has it
-			 * open and it will be fully removed once that handle is closed.
-			 * Meanwhile, we can't open it, so indicate that the file just
-			 * doesn't exist.
-			 */
-			errno = ENOENT;
-			return -1;
-		}
-
-		return r;
-	}
-
-	if (!GetFileAttributesEx(path, GetFileExInfoStandard, &attr))
-	{
-		_dosmaperr(GetLastError());
-		return -1;
-	}
-
-	/*
-	 * XXX no support for large files here, but we don't do that in general on
-	 * Win32 yet.
-	 */
-	buf->st_size = attr.nFileSizeLow;
-
-	return 0;
-}
-
-#endif
diff --git a/src/port/win32stat.c b/src/port/win32stat.c
new file mode 100644
index 0000000..82c7351
--- /dev/null
+++ b/src/port/win32stat.c
@@ -0,0 +1,267 @@
+/*-------------------------------------------------------------------------
+ *
+ * win32stat.c
+ *	  Replacements for <sys/stat.h> functions using GetFileInformationByHandle
+ *    on Win32.
+ *
+ * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/port/win32stat.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifdef WIN32
+
+#include "c.h"
+#include <windows.h>
+
+/*
+ * In order to support MinGW and MSVC2013 we use NtQueryInformationFile as an
+ * alternative for GetFileInformationByHandleEx. It is loaded from the ntdll
+ * library.
+ */
+#if _WIN32_WINNT < 0x0600
+#include <winternl.h>
+#if !defined(__MINGW32__) && !defined(__MINGW64__)
+/* MinGW includes this in <winternl.h>, but is missing in MSVC */
+typedef struct _FILE_STANDARD_INFORMATION
+{
+	LARGE_INTEGER AllocationSize;
+	LARGE_INTEGER EndOfFile;
+	ULONG         NumberOfLinks;
+	BOOLEAN       DeletePending;
+	BOOLEAN       Directory;
+} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION;
+#define FileStandardInformation 5
+#endif /* !defined(__MINGW32__) && !defined(__MINGW64__) */
+
+typedef NTSTATUS (NTAPI *PFN_NTQUERYINFORMATIONFILE)
+(
+	IN HANDLE FileHandle,
+	OUT PIO_STATUS_BLOCK IoStatusBlock,
+	OUT PVOID FileInformation,
+	IN ULONG Length,
+	IN FILE_INFORMATION_CLASS FileInformationClass
+);
+
+static PFN_NTQUERYINFORMATIONFILE _NtQueryInformationFile = NULL;
+
+/*
+ * Load DLL file just once regardless of how many functions we load/call in it.
+ */
+static HMODULE ntdll = NULL;
+
+static void
+LoadNtdll(void)
+{
+	if (ntdll != NULL)
+		return;
+	ntdll = LoadLibraryEx("ntdll.dll", NULL, 0);
+}
+#endif /* _WIN32_WINNT < 0x0600 */
+
+static const unsigned __int64 EpochShift = UINT64CONST(116444736000000000);
+
+/*
+ * Converts a FILETIME struct into a 64 bit time_t.
+ */
+static __time64_t
+filetime_to_time(FILETIME const *ft)
+{
+	ULARGE_INTEGER unified_ft = {0};
+
+	unified_ft.LowPart  = ft->dwLowDateTime;
+	unified_ft.HighPart = ft->dwHighDateTime;
+
+	if (unified_ft.QuadPart < EpochShift)
+		return -1;
+
+	unified_ft.QuadPart -= EpochShift;
+	unified_ft.QuadPart /= 10 * 1000 * 1000;
+
+	return unified_ft.QuadPart;
+}
+
+/*
+ * Converts WIN32 file attributes to unix mode.
+ * Only owner permissions are set.
+ */
+static unsigned short
+fileattr_to_unixmode(int attr)
+{
+	unsigned short uxmode = 0;
+
+	uxmode |= (unsigned short)((attr & FILE_ATTRIBUTE_DIRECTORY) ?
+			 (_S_IFDIR) : (_S_IFREG));
+
+	uxmode |= (unsigned short)(attr & FILE_ATTRIBUTE_READONLY) ?
+			  (_S_IREAD) : (_S_IREAD | _S_IWRITE);
+
+	/* There is no need to simulate _S_IEXEC using CMD's PATHEXT extensions */
+	uxmode |= _S_IEXEC;
+
+	return uxmode;
+}
+
+/*
+ * Converts WIN32 file infomation to struct stat.
+ * GetFileInformationByHandle minimum supported version: Windows XP and
+ * Windows Server 2003.
+ */
+static int
+fileinfo_to_stat(HANDLE hFile, struct stat *buf)
+{
+	BY_HANDLE_FILE_INFORMATION fiData;
+
+	if (!GetFileInformationByHandle(hFile, &fiData))
+	{
+		 _dosmaperr(GetLastError());
+		return -1;
+	}
+
+	memset(buf, 0, sizeof(*buf));
+	if (fiData.ftLastWriteTime.dwLowDateTime ||
+		fiData.ftLastWriteTime.dwHighDateTime)
+		buf->st_mtime = filetime_to_time(&fiData.ftLastWriteTime);
+
+	if (fiData.ftLastAccessTime.dwLowDateTime ||
+		fiData.ftLastAccessTime.dwHighDateTime)
+		buf->st_atime = filetime_to_time(&fiData.ftLastAccessTime);
+	else
+		buf->st_atime = buf->st_mtime;
+
+	if (fiData.ftCreationTime.dwLowDateTime ||
+		fiData.ftCreationTime.dwHighDateTime)
+		buf->st_ctime = filetime_to_time(&fiData.ftCreationTime);
+	else
+		buf->st_ctime = buf->st_mtime;
+
+	buf->st_mode  = fileattr_to_unixmode(fiData.dwFileAttributes);
+	buf->st_nlink = fiData.nNumberOfLinks;
+
+	buf->st_size = ((__int64) fiData.nFileSizeHigh) << 32 |
+				   (__int64)(fiData.nFileSizeLow);
+	return 0;
+}
+
+/*
+ * We must use a handle so lstat() returns the information of the target file.
+ * As a reliable test for ERROR_DELETE_PENDING we use NtQueryInformationFile
+ * from Windows 2000 or GetFileInformationByHandleEx from Server 2008 / Vista.
+ */
+int
+_pgstat64(const char *name, struct stat *buf)
+{
+	SECURITY_ATTRIBUTES sa;
+	HANDLE hFile;
+	int		ret;
+#if _WIN32_WINNT < 0x0600
+	IO_STATUS_BLOCK ioStatus;
+	FILE_STANDARD_INFORMATION standardInfo;
+#else
+	FILE_STANDARD_INFO standardInfo;
+#endif
+
+	if (name == NULL || buf == NULL)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+	/* fast not exists */
+	if (GetFileAttributes(name) == INVALID_FILE_ATTRIBUTES)
+	{
+		errno = ENOENT;
+		return -1;
+	}
+
+	/* Get a file handle as lightweight as we can */
+	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+	sa.bInheritHandle = TRUE;
+	sa.lpSecurityDescriptor = NULL;
+	hFile = CreateFile(name, GENERIC_READ,
+					   (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE),
+					   &sa, OPEN_EXISTING,
+					   (FILE_FLAG_NO_BUFFERING | FILE_FLAG_BACKUP_SEMANTICS |
+					   FILE_FLAG_OVERLAPPED), NULL);
+	if (hFile == INVALID_HANDLE_VALUE)
+	{
+		CloseHandle(hFile);
+		errno = ENOENT;
+		return -1;
+	}
+
+	memset(&standardInfo, 0, sizeof(standardInfo));
+#if _WIN32_WINNT < 0x0600
+	if (_NtQueryInformationFile == NULL)
+	{
+		LoadNtdll();
+		if(ntdll == NULL)
+		{
+			_dosmaperr(GetLastError());
+			CloseHandle(hFile);
+			return -1;
+		}
+
+		_NtQueryInformationFile = (PFN_NTQUERYINFORMATIONFILE)
+			GetProcAddress(ntdll, "NtQueryInformationFile");
+		if (_NtQueryInformationFile == NULL)
+		{
+			_dosmaperr(GetLastError());
+			CloseHandle(hFile);
+			return -1;
+		}
+	}
+
+	if (!NT_SUCCESS(_NtQueryInformationFile(hFile, &ioStatus, &standardInfo,
+		sizeof(standardInfo), FileStandardInformation)))
+#else
+	if (!GetFileInformationByHandleEx(hFile, FileStandardInfo, &standardInfo,
+		sizeof(standardInfo)))
+#endif /* _WIN32_WINNT < 0x0600 */
+	{
+		 _dosmaperr(GetLastError());
+		CloseHandle(hFile);
+		return -1;
+	}
+	if (standardInfo.DeletePending)
+	{
+		/*
+		 * File has been deleted, but is not gone from the filesystem yet.
+		 * This can happen when some process with FILE_SHARE_DELETE has it
+		 * open and it will be fully removed once that handle is closed.
+		 * Meanwhile, we can't open it, so indicate that the file just
+		 * doesn't exist.
+		 */
+		CloseHandle(hFile);
+		errno = ENOENT;
+		return -1;
+	}
+
+	ret = fileinfo_to_stat(hFile, buf);
+	CloseHandle(hFile);
+	return ret;
+}
+
+/*
+ * Since we already have a file handle there is no need to check for
+ * ERROR_DELETE_PENDING.
+ */
+int
+_pgfstat64(int fileno, struct stat *buf)
+{
+	HANDLE hFile = (HANDLE)_get_osfhandle(fileno);
+
+	if (hFile == INVALID_HANDLE_VALUE || buf == NULL)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+
+	return fileinfo_to_stat(hFile, buf);
+}
+
+#endif /* WIN32 */
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 834c2c3..6ff0783 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -103,7 +103,7 @@ sub mkvcbuild
 	  pg_strong_random.c pgcheckdir.c pgmkdirp.c pgsleep.c pgstrcasecmp.c
 	  pqsignal.c mkdtemp.c qsort.c qsort_arg.c quotes.c system.c
 	  sprompt.c strerror.c tar.c thread.c
-	  win32env.c win32error.c win32security.c win32setlocale.c);
+	  win32env.c win32error.c win32security.c win32setlocale.c win32stat.c);
 
 	push(@pgportfiles, 'strtof.c') if ($vsVersion < '14.00');
 
-- 
2.11.0

From 95a62ddf6c71abd680170b6ea0c76c6a9205b871 Mon Sep 17 00:00:00 2001
From: Juan Jose Santamaria Flecha <juanjo.santamaria@gmail.com>
Date: Thu, 17 Sep 2020 11:08:41 -0400
Subject: [PATCH] Support for large files on Win32. Workaround for Windows
 <sys/stat.h> shortcomings, reimplement fstat()/stat() on top of
 GetFileInformationByHandle() and use 64 bits struct stat.

---
 configure                     |   6 +
 configure.ac                  |   1 +
 src/include/port/win32_port.h |  41 +++++--
 src/port/dirmod.c             |  52 --------
 src/port/win32stat.c          | 268 ++++++++++++++++++++++++++++++++++++++++++
 src/tools/msvc/Mkvcbuild.pm   |   2 +-
 6 files changed, 305 insertions(+), 65 deletions(-)
 create mode 100644 src/port/win32stat.c

diff --git a/configure b/configure
index 19a3cd0..071d050 100755
--- a/configure
+++ b/configure
@@ -16137,6 +16137,12 @@ esac
  ;;
 esac
 
+  case " $LIBOBJS " in
+  *" win32stat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS win32stat.$ac_objext"
+ ;;
+esac
+
 
 $as_echo "#define HAVE_SYMLINK 1" >>confdefs.h
 
diff --git a/configure.ac b/configure.ac
index 6b9d048..e9ce611 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1807,6 +1807,7 @@ if test "$PORTNAME" = "win32"; then
   AC_LIBOBJ(win32error)
   AC_LIBOBJ(win32security)
   AC_LIBOBJ(win32setlocale)
+  AC_LIBOBJ(win32stat)
   AC_DEFINE([HAVE_SYMLINK], 1,
             [Define to 1 if you have the `symlink' function.])
   AC_CHECK_TYPES(MINIDUMP_TYPE, [pgac_minidump_type=yes], [pgac_minidump_type=no], [
diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index 8b6576b..1860bdd 100644
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -51,7 +51,12 @@
 #include <signal.h>
 #include <direct.h>
 #undef near
-#include <sys/stat.h>			/* needed before sys/stat hacking below */
+/* needed before sys/stat hacking below */
+#define fstat microsoft_native_fstat
+#define stat microsoft_native_stat
+#include <sys/stat.h>
+#undef fstat
+#undef stat
 
 /* Must be here to avoid conflicting with prototype in windows.h */
 #define mkdir(a,b)	mkdir(a)
@@ -240,20 +245,32 @@ typedef int pid_t;
  * Supplement to <sys/stat.h>.
  *
  * We must pull in sys/stat.h before this part, else our overrides lose.
- */
-#define lstat(path, sb) stat(path, sb)
-
-/*
+ *
  * stat() is not guaranteed to set the st_size field on win32, so we
- * redefine it to our own implementation that is.
+ * redefine it to our own implementation. See src/port/win32stat.c.
  *
- * Some frontends don't need the size from stat, so if UNSAFE_STAT_OK
- * is defined we don't bother with this.
+ * The struct stat is 32 bit in MSVC, so we redefine it as a copy of
+ * struct _stat64. This also fixes the struct size for MINGW builds.
  */
-#ifndef UNSAFE_STAT_OK
-extern int	pgwin32_safestat(const char *path, struct stat *buf);
-#define stat(a,b) pgwin32_safestat(a,b)
-#endif
+struct stat                     /* It is actually _stat64 */
+{
+	_dev_t         st_dev;
+	_ino_t         st_ino;
+	unsigned short st_mode;
+	short          st_nlink;
+	short          st_uid;
+	short          st_gid;
+	_dev_t         st_rdev;
+	__int64        st_size;
+	__time64_t     st_atime;
+	__time64_t     st_mtime;
+	__time64_t     st_ctime;
+};
+extern int _pgfstat64(int fileno, struct stat *buf);
+extern int _pgstat64(const char *name, struct stat *buf);
+#define fstat(fileno, sb) _pgfstat64(fileno, sb)
+#define stat(path, sb) _pgstat64(path, sb)
+#define lstat(path, sb) _pgstat64(path, sb)
 
 /* These macros are not provided by older MinGW, nor by MSVC */
 #ifndef S_IRUSR
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index e22a41c..8979f10 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -353,55 +353,3 @@ pgwin32_is_junction(const char *path)
 	return ((attr & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT);
 }
 #endif							/* defined(WIN32) && !defined(__CYGWIN__) */
-
-
-#if defined(WIN32) && !defined(__CYGWIN__)
-
-#undef stat
-
-/*
- * The stat() function in win32 is not guaranteed to update the st_size
- * field when run. So we define our own version that uses the Win32 API
- * to update this field.
- */
-int
-pgwin32_safestat(const char *path, struct stat *buf)
-{
-	int			r;
-	WIN32_FILE_ATTRIBUTE_DATA attr;
-
-	r = stat(path, buf);
-	if (r < 0)
-	{
-		if (GetLastError() == ERROR_DELETE_PENDING)
-		{
-			/*
-			 * File has been deleted, but is not gone from the filesystem yet.
-			 * This can happen when some process with FILE_SHARE_DELETE has it
-			 * open and it will be fully removed once that handle is closed.
-			 * Meanwhile, we can't open it, so indicate that the file just
-			 * doesn't exist.
-			 */
-			errno = ENOENT;
-			return -1;
-		}
-
-		return r;
-	}
-
-	if (!GetFileAttributesEx(path, GetFileExInfoStandard, &attr))
-	{
-		_dosmaperr(GetLastError());
-		return -1;
-	}
-
-	/*
-	 * XXX no support for large files here, but we don't do that in general on
-	 * Win32 yet.
-	 */
-	buf->st_size = attr.nFileSizeLow;
-
-	return 0;
-}
-
-#endif
diff --git a/src/port/win32stat.c b/src/port/win32stat.c
new file mode 100644
index 0000000..2367844
--- /dev/null
+++ b/src/port/win32stat.c
@@ -0,0 +1,268 @@
+/*-------------------------------------------------------------------------
+ *
+ * win32stat.c
+ *	  Replacements for <sys/stat.h> functions using GetFileInformationByHandle
+ *    on Win32.
+ *
+ * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/port/win32stat.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifdef WIN32
+
+#include "c.h"
+#include <windows.h>
+
+/*
+ * In order to support MinGW and MSVC2013 we use NtQueryInformationFile as an
+ * alternative for GetFileInformationByHandleEx. It is loaded from the ntdll
+ * library.
+ */
+#if _WIN32_WINNT < 0x0600
+#include <winternl.h>
+#if !defined(__MINGW32__) && !defined(__MINGW64__)
+/* MinGW includes this in <winternl.h>, but is missing in MSVC */
+typedef struct _FILE_STANDARD_INFORMATION
+{
+	LARGE_INTEGER AllocationSize;
+	LARGE_INTEGER EndOfFile;
+	ULONG         NumberOfLinks;
+	BOOLEAN       DeletePending;
+	BOOLEAN       Directory;
+} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION;
+#define FileStandardInformation 5
+#endif /* !defined(__MINGW32__) && !defined(__MINGW64__) */
+
+typedef NTSTATUS (NTAPI *PFN_NTQUERYINFORMATIONFILE)
+(
+	IN HANDLE FileHandle,
+	OUT PIO_STATUS_BLOCK IoStatusBlock,
+	OUT PVOID FileInformation,
+	IN ULONG Length,
+	IN FILE_INFORMATION_CLASS FileInformationClass
+);
+
+static PFN_NTQUERYINFORMATIONFILE _NtQueryInformationFile = NULL;
+
+/*
+ * Load DLL file just once regardless of how many functions we load/call in it.
+ */
+static HMODULE ntdll = NULL;
+
+static void
+LoadNtdll(void)
+{
+	if (ntdll != NULL)
+		return;
+	ntdll = LoadLibraryEx("ntdll.dll", NULL, 0);
+}
+#endif /* _WIN32_WINNT < 0x0600 */
+
+static const unsigned __int64 EpochShift = UINT64CONST(116444736000000000);
+
+/*
+ * Converts a FILETIME struct into a 64 bit time_t.
+ */
+static __time64_t
+filetime_to_time(FILETIME const *ft)
+{
+	ULARGE_INTEGER unified_ft = {0};
+
+	unified_ft.LowPart  = ft->dwLowDateTime;
+	unified_ft.HighPart = ft->dwHighDateTime;
+
+	if (unified_ft.QuadPart < EpochShift)
+		return -1;
+
+	unified_ft.QuadPart -= EpochShift;
+	unified_ft.QuadPart /= 10 * 1000 * 1000;
+
+	return unified_ft.QuadPart;
+}
+
+/*
+ * Converts WIN32 file attributes to unix mode.
+ * Only owner permissions are set.
+ */
+static unsigned short
+fileattr_to_unixmode(int attr)
+{
+	unsigned short uxmode = 0;
+
+	uxmode |= (unsigned short)((attr & FILE_ATTRIBUTE_DIRECTORY) ?
+			 (_S_IFDIR) : (_S_IFREG));
+
+	uxmode |= (unsigned short)(attr & FILE_ATTRIBUTE_READONLY) ?
+			  (_S_IREAD) : (_S_IREAD | _S_IWRITE);
+
+	/* there is no need to simulate _S_IEXEC using CMD's PATHEXT extensions */
+	uxmode |= _S_IEXEC;
+
+	return uxmode;
+}
+
+/*
+ * Converts WIN32 file infomation to struct stat.
+ * GetFileInformationByHandle minimum supported version: Windows XP and
+ * Windows Server 2003.
+ */
+static int
+fileinfo_to_stat(HANDLE hFile, struct stat *buf)
+{
+	BY_HANDLE_FILE_INFORMATION fiData;
+
+	if (!GetFileInformationByHandle(hFile, &fiData))
+	{
+		 _dosmaperr(GetLastError());
+		return -1;
+	}
+
+	memset(buf, 0, sizeof(*buf));
+	if (fiData.ftLastWriteTime.dwLowDateTime ||
+		fiData.ftLastWriteTime.dwHighDateTime)
+		buf->st_mtime = filetime_to_time(&fiData.ftLastWriteTime);
+
+	if (fiData.ftLastAccessTime.dwLowDateTime ||
+		fiData.ftLastAccessTime.dwHighDateTime)
+		buf->st_atime = filetime_to_time(&fiData.ftLastAccessTime);
+	else
+		buf->st_atime = buf->st_mtime;
+
+	if (fiData.ftCreationTime.dwLowDateTime ||
+		fiData.ftCreationTime.dwHighDateTime)
+		buf->st_ctime = filetime_to_time(&fiData.ftCreationTime);
+	else
+		buf->st_ctime = buf->st_mtime;
+
+	buf->st_mode  = fileattr_to_unixmode(fiData.dwFileAttributes);
+	buf->st_nlink = fiData.nNumberOfLinks;
+
+	buf->st_size = ((__int64) fiData.nFileSizeHigh) << 32 |
+				   (__int64)(fiData.nFileSizeLow);
+	return 0;
+}
+
+/*
+ * We must use a handle so lstat() returns the information of the target file.
+ * As a reliable test for ERROR_DELETE_PENDING we use NtQueryInformationFile
+ * from Windows 2000 or GetFileInformationByHandleEx from Server 2008 / Vista.
+ */
+int
+_pgstat64(const char *name, struct stat *buf)
+{
+	SECURITY_ATTRIBUTES sa;
+	HANDLE hFile;
+	int		ret;
+#if _WIN32_WINNT < 0x0600
+	IO_STATUS_BLOCK ioStatus;
+	FILE_STANDARD_INFORMATION standardInfo;
+#else
+	FILE_STANDARD_INFO standardInfo;
+#endif
+
+	if (name == NULL || buf == NULL)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+	/* fast not exists */
+	if (GetFileAttributes(name) == INVALID_FILE_ATTRIBUTES)
+	{
+		errno = ENOENT;
+		return -1;
+	}
+
+	/* get a file handle as lightweight as we can */
+	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+	sa.bInheritHandle = TRUE;
+	sa.lpSecurityDescriptor = NULL;
+	hFile = CreateFile(name, GENERIC_READ,
+					   (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE),
+					   &sa, OPEN_EXISTING,
+					   (FILE_FLAG_NO_BUFFERING | FILE_FLAG_BACKUP_SEMANTICS |
+					   FILE_FLAG_OVERLAPPED), NULL);
+	if (hFile == INVALID_HANDLE_VALUE)
+	{
+		CloseHandle(hFile);
+		errno = ENOENT;
+		return -1;
+	}
+
+	memset(&standardInfo, 0, sizeof(standardInfo));
+#if _WIN32_WINNT < 0x0600
+	if (_NtQueryInformationFile == NULL)
+	{
+		LoadNtdll();
+		if(ntdll == NULL)
+		{
+			_dosmaperr(GetLastError());
+			CloseHandle(hFile);
+			return -1;
+		}
+
+		_NtQueryInformationFile = (PFN_NTQUERYINFORMATIONFILE)
+			GetProcAddress(ntdll, "NtQueryInformationFile");
+		if (_NtQueryInformationFile == NULL)
+		{
+			_dosmaperr(GetLastError());
+			CloseHandle(hFile);
+			return -1;
+		}
+	}
+
+	if (!NT_SUCCESS(_NtQueryInformationFile(hFile, &ioStatus, &standardInfo,
+		sizeof(standardInfo), FileStandardInformation)))
+#else
+	if (!GetFileInformationByHandleEx(hFile, FileStandardInfo, &standardInfo,
+		sizeof(standardInfo)))
+#endif /* _WIN32_WINNT < 0x0600 */
+	{
+		 _dosmaperr(GetLastError());
+		CloseHandle(hFile);
+		return -1;
+	}
+	if (standardInfo.DeletePending)
+	{
+		/*
+		 * File has been deleted, but is not gone from the filesystem yet.
+		 * This can happen when some process with FILE_SHARE_DELETE has it
+		 * open and it will be fully removed once that handle is closed.
+		 * Meanwhile, we can't open it, so indicate that the file just
+		 * doesn't exist.
+		 */
+		CloseHandle(hFile);
+		errno = ENOENT;
+		return -1;
+	}
+
+	ret = fileinfo_to_stat(hFile, buf);
+	CloseHandle(hFile);
+	return ret;
+}
+
+/*
+ * Since we already have a file handle there is no need to check for
+ * ERROR_DELETE_PENDING.
+ */
+int
+_pgfstat64(int fileno, struct stat *buf)
+{
+	HANDLE hFile = (HANDLE)_get_osfhandle(fileno);
+
+	if (hFile == INVALID_HANDLE_VALUE || buf == NULL)
+	{
+		errno = EINVAL;
+		return -1;
+	}
+
+	return fileinfo_to_stat(hFile, buf);
+}
+
+#endif /* WIN32 */
+
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 89e1b39..90594bd 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -103,7 +103,7 @@ sub mkvcbuild
 	  pg_strong_random.c pgcheckdir.c pgmkdirp.c pgsleep.c pgstrcasecmp.c
 	  pqsignal.c mkdtemp.c qsort.c qsort_arg.c quotes.c system.c
 	  strerror.c tar.c thread.c
-	  win32env.c win32error.c win32security.c win32setlocale.c);
+	  win32env.c win32error.c win32security.c win32setlocale.c win32stat.c);
 
 	push(@pgportfiles, 'strtof.c') if ($vsVersion < '14.00');
 
-- 
2.11.0

diff --git a/src/port/win32stat.c b/src/port/win32stat.c
index a70df3a..92c2e66 100644
--- a/src/port/win32stat.c
+++ b/src/port/win32stat.c
@@ -101,8 +101,8 @@ fileattr_to_unixmode(int attr)
 	uxmode |= (unsigned short) ((attr & FILE_ATTRIBUTE_DIRECTORY) ?
 								(_S_IFDIR) : (_S_IFREG));
 
-	uxmode |= (unsigned short) (attr & FILE_ATTRIBUTE_READONLY) ?
-		(_S_IREAD) : (_S_IREAD | _S_IWRITE);
+	uxmode |= (unsigned short) ((attr & FILE_ATTRIBUTE_READONLY) ?
+								(_S_IREAD) : (_S_IREAD | _S_IWRITE));
 
 	/* there is no need to simulate _S_IEXEC using CMD's PATHEXT extensions */
 	uxmode |= _S_IEXEC;
@@ -149,8 +149,8 @@ fileinfo_to_stat(HANDLE hFile, struct stat *buf)
 	buf->st_mode = fileattr_to_unixmode(fiData.dwFileAttributes);
 	buf->st_nlink = fiData.nNumberOfLinks;
 
-	buf->st_size = (((uint64) fiData.nFileSizeHigh) << 32) |
-		(uint64) fiData.nFileSizeLow;
+	buf->st_size = ((((uint64) fiData.nFileSizeHigh) << 32) |
+					fiData.nFileSizeLowi);
 
 	return 0;
 }
@@ -188,7 +188,13 @@ _pgstat64(const char *name, struct stat *buf)
 	/* fast not-exists check */
 	if (GetFileAttributes(name) == INVALID_FILE_ATTRIBUTES)
 	{
-		_dosmaperr(GetLastError());
+		DWORD		err = GetLastError();
+
+		/* report when not ERROR_SUCCESS */
+		if (err == ERROR_FILE_NOT_FOUND || err == ERROR_PATH_NOT_FOUND)
+			errno = ENOENT;
+		else
+			_dosmaperr(err);
 		return -1;
 	}
 
@@ -220,8 +226,10 @@ _pgstat64(const char *name, struct stat *buf)
 		LoadNtdll();
 		if (ntdll == NULL)
 		{
-			_dosmaperr(GetLastError());
+			DWORD		err = GetLastError();
+
 			CloseHandle(hFile);
+			_dosmaperr(err);
 			return -1;
 		}
 
@@ -229,8 +237,10 @@ _pgstat64(const char *name, struct stat *buf)
 			GetProcAddress(ntdll, "NtQueryInformationFile");
 		if (_NtQueryInformationFile == NULL)
 		{
-			_dosmaperr(GetLastError());
+			DWORD		err = GetLastError();
+
 			CloseHandle(hFile);
+			_dosmaperr(err);
 			return -1;
 		}
 	}
@@ -239,16 +249,20 @@ _pgstat64(const char *name, struct stat *buf)
 											sizeof(standardInfo),
 											FileStandardInformation)))
 	{
-		_dosmaperr(GetLastError());
+		DWORD		err = GetLastError();
+
 		CloseHandle(hFile);
+		_dosmaperr(err);
 		return -1;
 	}
 #else
 	if (!GetFileInformationByHandleEx(hFile, FileStandardInfo, &standardInfo,
 									  sizeof(standardInfo)))
 	{
-		_dosmaperr(GetLastError());
+		DWORD		err = GetLastError();
+
 		CloseHandle(hFile);
+		_dosmaperr(err);
 		return -1;
 	}
 #endif							/* _WIN32_WINNT < 0x0600 */