aboutsummaryrefslogtreecommitdiffstats
path: root/util-src
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-27 01:02:54 +0200
committerKim Alvefur <zash@zash.se>2014-04-27 01:02:54 +0200
commit38d9c9ebddb923482b91361547ee73a6e5f2cbe8 (patch)
treef5037556f62b8874e8a8bd1c42bdcce76b190ffe /util-src
parent9c5384c1f1343bf2b8c60623f264869f4f1a0f07 (diff)
parentdbf3c7d1a0b749ab0abe2e2565a7ca70ca8e6a47 (diff)
downloadprosody-38d9c9ebddb923482b91361547ee73a6e5f2cbe8.tar.gz
prosody-38d9c9ebddb923482b91361547ee73a6e5f2cbe8.zip
Merge 0.10->trunk
Diffstat (limited to 'util-src')
-rw-r--r--util-src/pposix.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/util-src/pposix.c b/util-src/pposix.c
index 73e0d6e3..9b3e97eb 100644
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -674,6 +674,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)
@@ -683,11 +684,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)
{
@@ -701,7 +706,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;
@@ -709,7 +715,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);