From: Howard Chu <hyc@symas.com>
Date: Wed, 8 Oct 2014 18:25:27 +0000 (+0100)
Subject: ITS#7959 fix prev commit
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=925e7805a5b2d4bc2d464ea5acd5ff38ff209bde;p=openldap

ITS#7959 fix prev commit

fstat returns -1, not an errno. Move code into its own function
for reuse.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 9728cb6af0..9e65c2741d 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -3866,6 +3866,27 @@ mdb_env_get_maxreaders(MDB_env *env, unsigned int *readers)
 	return MDB_SUCCESS;
 }
 
+static int ESECT
+mdb_fsize(HANDLE fd, size_t *size)
+{
+#ifdef WIN32
+	LARGE_INTEGER fsize;
+
+	if (!GetFileSizeEx(fd, &fsize))
+		return ErrCode();
+
+	*size = fsize.QuadPart;
+#else
+	struct stat st;
+
+	if (fstat(fd, &st))
+		return ErrCode();
+
+	*size = st.st_size;
+#endif
+	return MDB_SUCCESS;
+}
+
 /** Further setup required for opening an LMDB environment
  */
 static int ESECT
@@ -8722,30 +8743,13 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd)
 		goto leave;
 
 	w2 = txn->mt_next_pgno * env->me_psize;
-#ifdef WIN32
 	{
-		LARGE_INTEGER fsize;
-
-		if (!GetFileSizeEx(env->me_fd, &fsize)) {
-			rc = ErrCode();
+		size_t fsize = 0;
+		if ((rc = mdb_fsize(env->me_fd, &fsize)))
 			goto leave;
-		}
-
-		if (w2 > fsize.QuadPart)
-			w2 = fsize.QuadPart;
+		if (w2 > fsize)
+			w2 = fsize;
 	}
-#else
-	{
-		struct stat st;
-
-		if ((rc = fstat(env->me_fd, &st))) {
-			goto leave;
-		}
-
-		if (w2 > (size_t)st.st_size)
-			w2 = st.st_size;
-	}
-#endif
 	wsize = w2 - wsize;
 	while (wsize > 0) {
 		if (wsize > MAX_WRITE)