aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-25 00:36:01 +0200
committerKim Alvefur <zash@zash.se>2014-04-25 00:36:01 +0200
commitc62c48c5e324f3e1417e38dc40d7a3ca1cd913c3 (patch)
treea9ba29d88ae16ec9f78d97d9a24d6bbaaa94dd71
parente02bb3f3073423bed59f322907d186d75372bc0d (diff)
downloadprosody-c62c48c5e324f3e1417e38dc40d7a3ca1cd913c3.tar.gz
prosody-c62c48c5e324f3e1417e38dc40d7a3ca1cd913c3.zip
util.pposix: Fix error reporting from posix_fallocate, it doesn't use errno (thanks pro)
-rw-r--r--util-src/pposix.c6
1 files changed, 4 insertions, 2 deletions
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);