ITS#7959 fix prev commit

fstat returns -1, not an errno. Move code into its own function
for reuse.
mdb.RE/0.9
Howard Chu 10 years ago committed by Hallvard Furuseth
parent ce40f4f314
commit 3ce002fd13
  1. 46
      libraries/liblmdb/mdb.c

@ -3828,6 +3828,27 @@ mdb_env_get_maxreaders(MDB_env *env, unsigned int *readers)
return MDB_SUCCESS; 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 /** Further setup required for opening an LMDB environment
*/ */
static int ESECT static int ESECT
@ -8690,30 +8711,13 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd)
goto leave; goto leave;
w2 = txn->mt_next_pgno * env->me_psize; w2 = txn->mt_next_pgno * env->me_psize;
#ifdef WIN32
{ {
LARGE_INTEGER fsize; size_t fsize = 0;
if ((rc = mdb_fsize(env->me_fd, &fsize)))
if (!GetFileSizeEx(env->me_fd, &fsize)) {
rc = ErrCode();
goto leave; goto leave;
} if (w2 > fsize)
w2 = fsize;
if (w2 > fsize.QuadPart)
w2 = fsize.QuadPart;
} }
#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; wsize = w2 - wsize;
while (wsize > 0) { while (wsize > 0) {
if (wsize > MAX_WRITE) if (wsize > MAX_WRITE)

Loading…
Cancel
Save