Merge 0.9->0.10

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

diff --git a/util-src/pposix.c b/util-src/pposix.c
index f5cc827032976c74c3ac624620b46aebb85c658a..49e80f711f0bac54211c5cc8c260edb9940d4bde 100644 (file)
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -35,8 +35,12 @@
 #include "lualib.h"
 #include "lauxlib.h"
 
+#if (LUA_VERSION_NUM == 502)
+#define luaL_register(L, N, R) luaL_setfuncs(L, R, 0)
+#endif
+
 #include <fcntl.h>
-#if defined(_GNU_SOURCE)
+#if defined(__linux__) && defined(_GNU_SOURCE)
 #include <linux/falloc.h>
 #endif
 
@@ -491,48 +495,51 @@ int string2resource(const char *s) {
        return -1;
 }
 
+unsigned long int arg_to_rlimit(lua_State* L, int idx, rlim_t current) {
+       switch(lua_type(L, idx)) {
+       case LUA_TSTRING:
+               if(strcmp(lua_tostring(L, idx), "unlimited") == 0)
+                       return RLIM_INFINITY;
+       case LUA_TNUMBER:
+               return lua_tointeger(L, idx);
+       case LUA_TNONE:
+       case LUA_TNIL:
+               return current;
+       default:
+               return luaL_argerror(L, idx, "unexpected type");
+       }
+}
+
 int lc_setrlimit(lua_State *L) {
+       struct rlimit lim;
        int arguments = lua_gettop(L);
-       int softlimit = -1;
-       int hardlimit = -1;
-       const char *resource = NULL;
        int rid = -1;
        if(arguments < 1 || arguments > 3) {
                lua_pushboolean(L, 0);
                lua_pushstring(L, "incorrect-arguments");
+               return 2;
        }
 
-       resource = luaL_checkstring(L, 1);
-       softlimit = luaL_checkinteger(L, 2);
-       hardlimit = luaL_checkinteger(L, 3);
+       rid = string2resource(luaL_checkstring(L, 1));
+       if (rid == -1) {
+               lua_pushboolean(L, 0);
+               lua_pushstring(L, "invalid-resource");
+               return 2;
+       }
 
-       rid = string2resource(resource);
-       if (rid != -1) {
-               struct rlimit lim;
-               struct rlimit lim_current;
-
-               if (softlimit < 0 || hardlimit < 0) {
-                       if (getrlimit(rid, &lim_current)) {
-                               lua_pushboolean(L, 0);
-                               lua_pushstring(L, "getrlimit-failed");
-                               return 2;
-                       }
-               }
+       /* Fetch current values to use as defaults */
+       if (getrlimit(rid, &lim)) {
+               lua_pushboolean(L, 0);
+               lua_pushstring(L, "getrlimit-failed");
+               return 2;
+       }
 
-               if (softlimit < 0) lim.rlim_cur = lim_current.rlim_cur;
-                       else lim.rlim_cur = softlimit;
-               if (hardlimit < 0) lim.rlim_max = lim_current.rlim_max;
-                       else lim.rlim_max = hardlimit;
+       lim.rlim_cur = arg_to_rlimit(L, 2, lim.rlim_cur);
+       lim.rlim_max = arg_to_rlimit(L, 3, lim.rlim_max);
 
-               if (setrlimit(rid, &lim)) {
-                       lua_pushboolean(L, 0);
-                       lua_pushstring(L, "setrlimit-failed");
-                       return 2;
-               }
-       } else {
-               /* Unsupported resoucrce. Sorry I'm pretty limited by POSIX standard. */
+       if (setrlimit(rid, &lim)) {
                lua_pushboolean(L, 0);
-               lua_pushstring(L, "invalid-resource");
+               lua_pushstring(L, "setrlimit-failed");
                return 2;
        }
        lua_pushboolean(L, 1);
@@ -551,6 +558,8 @@ int lc_getrlimit(lua_State *L) {
                return 2;
        }
 
+
+
        resource = luaL_checkstring(L, 1);
        rid = string2resource(resource);
        if (rid != -1) {
@@ -566,8 +575,14 @@ int lc_getrlimit(lua_State *L) {
                return 2;
        }
        lua_pushboolean(L, 1);
-       lua_pushnumber(L, lim.rlim_cur);
-       lua_pushnumber(L, lim.rlim_max);
+       if(lim.rlim_cur == RLIM_INFINITY)
+               lua_pushstring(L, "unlimited");
+       else
+               lua_pushnumber(L, lim.rlim_cur);
+       if(lim.rlim_max == RLIM_INFINITY)
+               lua_pushstring(L, "unlimited");
+       else
+               lua_pushnumber(L, lim.rlim_max);
        return 3;
 }
 
@@ -663,18 +678,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)
        {
@@ -688,7 +710,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;
@@ -696,7 +719,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);
@@ -749,7 +772,8 @@ int luaopen_util_pposix(lua_State *L)
                { NULL, NULL }
        };
 
-       luaL_register(L, "pposix",  exports);
+       lua_newtable(L);
+       luaL_register(L, NULL,  exports);
 
        lua_pushliteral(L, "pposix");
        lua_setfield(L, -2, "_NAME");