From 15b883a2f53249ca4706dfad2cb998ecffb501ba Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 25 Apr 2014 00:36:01 +0200 Subject: util.pposix: Fix error reporting from posix_fallocate, it doesn't use errno (thanks pro) --- util-src/pposix.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'util-src/pposix.c') diff --git a/util-src/pposix.c b/util-src/pposix.c index 4fb1fb56..a8654995 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -664,6 +664,7 @@ int lc_meminfo(lua_State* L) #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) @@ -691,7 +692,8 @@ int lc_fallocate(lua_State* L) #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; @@ -699,7 +701,7 @@ int lc_fallocate(lua_State* L) 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); -- cgit v1.2.3 From 92ed3576fcc5381d2e9a97688b2d337626ad6a3d Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 25 Apr 2014 02:41:55 +0200 Subject: util.pposix: Fix error reporting from really old Linux fallocate() that did not use errno for some reason (thanks pro) --- util-src/pposix.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'util-src/pposix.c') diff --git a/util-src/pposix.c b/util-src/pposix.c index a8654995..df814c28 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -674,11 +674,15 @@ int lc_fallocate(lua_State* L) 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) { -- cgit v1.2.3