# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1398553340 -7200
# Node ID 6b1aee6536e89cdf5792e765907a32b16b5905f2
# Parent  8fb54ec34741edf9896c02f3edd33feb2fcd9648# Parent  dc3497041aca8e66619e4e304dd2f34246b1859d
Merge 0.9->0.10

diff -r 8fb54ec34741 -r 6b1aee6536e8 util-src/pposix.c
--- a/util-src/pposix.c	Fri Apr 25 02:47:09 2014 +0200
+++ b/util-src/pposix.c	Sun Apr 27 01:02:20 2014 +0200
@@ -674,6 +674,7 @@
 #if _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L || defined(_GNU_SOURCE)
 int lc_fallocate(lua_State* L)
 {
+	int ret;
 	off_t offset, len;
 	FILE *f = *(FILE**) luaL_checkudata(L, 1, LUA_FILEHANDLE);
 	if (f == NULL)
@@ -683,11 +684,15 @@
 	len = luaL_checkinteger(L, 3);
 
 #if defined(__linux__) && defined(_GNU_SOURCE)
-	if(fallocate(fileno(f), FALLOC_FL_KEEP_SIZE, offset, len) == 0)
+	errno = 0;
+	ret = fallocate(fileno(f), FALLOC_FL_KEEP_SIZE, offset, len);
+	if(ret == 0)
 	{
 		lua_pushboolean(L, 1);
 		return 1;
 	}
+	/* Some old versions of Linux apparently use the return value instead of errno */
+	if(errno == 0) errno = ret;
 
 	if(errno != ENOSYS && errno != EOPNOTSUPP)
 	{
@@ -701,7 +706,8 @@
 #warning Note that posix_fallocate() will still be used on filesystems that dont support fallocate()
 #endif
 
-	if(posix_fallocate(fileno(f), offset, len) == 0)
+	ret = posix_fallocate(fileno(f), offset, len);
+	if(ret == 0)
 	{
 		lua_pushboolean(L, 1);
 		return 1;
@@ -709,7 +715,7 @@
 	else
 	{
 		lua_pushnil(L);
-		lua_pushstring(L, strerror(errno));
+		lua_pushstring(L, strerror(ret));
 		/* posix_fallocate() can leave a bunch of NULs at the end, so we cut that
 		 * this assumes that offset == length of the file */
 		ftruncate(fileno(f), offset);