sessionmanager: Make session.send() return true unless there really is an error ...

[prosody.git] / util-src / pposix.c

diff --git a/util-src/pposix.c b/util-src/pposix.c
index e2cd142ef99c4bff536b1ea4c6856ef1a1af8946..df814c2899fc98d90ccfed116cd1ada3cd3a2d1d 100644 (file)
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -36,7 +36,7 @@
 #include "lauxlib.h"
 
 #include <fcntl.h>
-#if defined(_GNU_SOURCE)
+#if defined(__linux__) && defined(_GNU_SOURCE)
 #include <linux/falloc.h>
 #endif
 
@@ -664,18 +664,25 @@ 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)
+               luaL_error(L, "attempt to use a closed file");
 
        offset = luaL_checkinteger(L, 2);
        len = luaL_checkinteger(L, 3);
 
-#if defined(_GNU_SOURCE)
-       if(fallocate(fileno(f), FALLOC_FL_KEEP_SIZE, offset, len) == 0)
+#if defined(__linux__) && defined(_GNU_SOURCE)
+       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)
        {
@@ -689,7 +696,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;
@@ -697,7 +705,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);