luci-0.9: merge r5414, r5415, r5450 and 5494

diff --git a/libs/nixio/src/address.c b/libs/nixio/src/address.c
index 41ab8a367ca288b101a3956c2840d224b9176ac1..41c6b8ae849c2a0c2204869e7f772ee7eaadb096 100644 (file)
--- a/libs/nixio/src/address.c
+++ b/libs/nixio/src/address.c
@@ -323,7 +323,7 @@ static int nixio_sock_getsockname(lua_State *L) {
        }
 
        lua_pushstring(L, addr.host);
-       lua_pushnumber(L, addr.port);
+       lua_pushinteger(L, addr.port);
        return 2;
 }
 
@@ -342,7 +342,7 @@ static int nixio_sock_getpeername(lua_State *L) {
        }
 
        lua_pushstring(L, addr.host);
-       lua_pushnumber(L, addr.port);
+       lua_pushinteger(L, addr.port);
        return 2;
 }
 

diff --git a/libs/nixio/src/binary.c b/libs/nixio/src/binary.c
index c2de388173689bcd9b9da7253ef028f800020831..2c41622280f0d706648c585a92fc816532ee5fa7 100644 (file)
--- a/libs/nixio/src/binary.c
+++ b/libs/nixio/src/binary.c
@@ -97,7 +97,7 @@ static const uint32_t nixio__crc32_tbl[] = {
 static int nixio_bin_crc32(lua_State *L) {
        size_t len;
        const char *buffer = luaL_checklstring(L, 1, &len);
-       uint32_t value = luaL_optnumber(L, 2, 0);
+       uint32_t value = luaL_optinteger(L, 2, 0);
 
        value = ~value;
        for (size_t i=0; i<len; i++) {

diff --git a/libs/nixio/src/bind.c b/libs/nixio/src/bind.c
index 7b2b719e337c2112d327d37dc943ac97733197ba..81ab0bb480037e42901fc5b2690cacb809b2cffb 100644 (file)
--- a/libs/nixio/src/bind.c
+++ b/libs/nixio/src/bind.c
@@ -261,7 +261,7 @@ static int nixio_sock_accept(lua_State *L) {
 
        if (!nixio__addr_parse(&addr, (struct sockaddr *)&saddr)) {
                lua_pushstring(L, addr.host);
-               lua_pushnumber(L, addr.port);
+               lua_pushinteger(L, addr.port);
                return 3;
        } else {
                return 1;

diff --git a/libs/nixio/src/bit.c b/libs/nixio/src/bit.c
index 9991a7ca412bbcc8408933c94d6e66e097eca2da..5b41e91aa44b4c145565994c9113ed1306d94f94 100644 (file)
--- a/libs/nixio/src/bit.c
+++ b/libs/nixio/src/bit.c
@@ -21,19 +21,19 @@
 #include <stdlib.h>
 
 /* 52 bit maximum precision */
-#define NIXIO_BIT_BMAX 52
-#define NIXIO_BIT_NMAX 0xfffffffffffff
+#define NIXIO_BIT_BMAX 32
+#define NIXIO_BIT_NMAX 0xffffffff
 
 #define NIXIO_BIT_XOP(BIT_XOP)                                         \
-       uint64_t oper = luaL_checknumber(L, 1);                 \
+       uint64_t oper = luaL_checkinteger(L, 1);                        \
        const int args = lua_gettop(L);                                 \
                                                                                                        \
        for (int i = 2; i <= args; i++) {                               \
-               uint64_t oper2 = luaL_checknumber(L, i);        \
+               uint64_t oper2 = luaL_checkinteger(L, i);       \
                oper BIT_XOP oper2;                                                     \
        }                                                                                               \
                                                                                                        \
-       lua_pushnumber(L, oper);                                                \
+       lua_pushinteger(L, oper);                                               \
        return 1;                                                                               \
 
 
@@ -54,30 +54,30 @@ static int nixio_bit_unset(lua_State *L) {
 }
 
 static int nixio_bit_not(lua_State *L) {
-       lua_pushnumber(L, (~((uint64_t)luaL_checknumber(L, 1))) & NIXIO_BIT_NMAX);
+       lua_pushinteger(L, (~((uint64_t)luaL_checkinteger(L, 1))) & NIXIO_BIT_NMAX);
        return 1;
 }
 
 static int nixio_bit_shl(lua_State *L) {
-       uint64_t oper = luaL_checknumber(L, 1);
+       uint64_t oper = luaL_checkinteger(L, 1);
        oper <<= luaL_checkinteger(L, 2);
        if (oper > NIXIO_BIT_NMAX) {
                return luaL_error(L, "arithmetic overflow");
        } else {
-               lua_pushnumber(L, oper);
+               lua_pushinteger(L, oper);
                return 1;
        }
 }
 
 static int nixio_bit_ashr(lua_State *L) {
-       int64_t oper = luaL_checknumber(L, 1);
-       lua_pushnumber(L, oper >> luaL_checkinteger(L, 2));
+       int64_t oper = luaL_checkinteger(L, 1);
+       lua_pushinteger(L, oper >> luaL_checkinteger(L, 2));
        return 1;
 }
 
 static int nixio_bit_shr(lua_State *L) {
-       uint64_t oper = luaL_checknumber(L, 1);
-       lua_pushnumber(L, oper >> luaL_checkinteger(L, 2));
+       uint64_t oper = luaL_checkinteger(L, 1);
+       lua_pushinteger(L, oper >> luaL_checkinteger(L, 2));
        return 1;
 }
 
@@ -86,21 +86,21 @@ static int nixio_bit_div(lua_State *L) {
 }
 
 static int nixio_bit_check(lua_State *L) {
-       uint64_t oper  = luaL_checknumber(L, 1);
-       uint64_t oper2 = luaL_checknumber(L, 2);
+       uint64_t oper  = luaL_checkinteger(L, 1);
+       uint64_t oper2 = luaL_checkinteger(L, 2);
        lua_pushboolean(L, (oper & oper2) == oper2);
        return 1;
 }
 
 static int nixio_bit_cast(lua_State *L) {
-       lua_pushnumber(L, ((uint64_t)luaL_checknumber(L, 1)) & NIXIO_BIT_NMAX);
+       lua_pushinteger(L, ((uint64_t)luaL_checkinteger(L, 1)) & NIXIO_BIT_NMAX);
        return 1;
 }
 
 static int nixio_bit_swap(lua_State *L) {
-       uint64_t op = luaL_checknumber(L, 1);
+       uint64_t op = luaL_checkinteger(L, 1);
        op = (op >> 24) | ((op >> 8) & 0xff00) | ((op & 0xff00) << 8) | (op << 24);
-       lua_pushnumber(L, op);
+       lua_pushinteger(L, op);
        return 1;
 }
 
@@ -126,9 +126,9 @@ static const luaL_reg R[] = {
 void nixio_open_bit(lua_State *L) {
        lua_newtable(L);
        luaL_register(L, NULL, R);
-       lua_pushnumber(L, NIXIO_BIT_BMAX);
+       lua_pushinteger(L, NIXIO_BIT_BMAX);
        lua_setfield(L, -2, "bits");
-       lua_pushnumber(L, NIXIO_BIT_NMAX);
+       lua_pushinteger(L, NIXIO_BIT_NMAX);
        lua_setfield(L, -2, "max");
        lua_setfield(L, -2, "bit");
 }

diff --git a/libs/nixio/src/file.c b/libs/nixio/src/file.c
index 9f99fb8277c334d39b679c949ea78591b093b113..bb9e0844b2498b14dc9aac32b4c3e22a16670016 100644 (file)
--- a/libs/nixio/src/file.c
+++ b/libs/nixio/src/file.c
@@ -226,7 +226,7 @@ static int nixio_file_read(lua_State *L) {
 
 static int nixio_file_seek(lua_State *L) {
        int fd = nixio__checkfd(L, 1);
-       off_t len = (off_t)luaL_checknumber(L, 2);
+       off_t len = (off_t)luaL_checkinteger(L, 2);
        int whence;
        const char *whstr = luaL_optlstring(L, 3, "set", NULL);
        if (!strcmp(whstr, "set")) {
@@ -242,7 +242,7 @@ static int nixio_file_seek(lua_State *L) {
        if (len == -1) {
                return nixio__perror(L);
        } else {
-               lua_pushnumber(L, len);
+               lua_pushinteger(L, len);
                return 1;
        }
 }
@@ -253,7 +253,7 @@ static int nixio_file_tell(lua_State *L) {
        if (pos < 0) {
                return nixio__perror(L);
        } else {
-               lua_pushnumber(L, pos);
+               lua_pushinteger(L, pos);
                return 1;
        }
 }
@@ -291,7 +291,7 @@ static int nixio_file_sync(lua_State *L) {
 static int nixio_file_lock(lua_State *L) {
        int fd = nixio__checkfd(L, 1);
        const char *flag = luaL_checkstring(L, 2);
-       off_t len = (off_t)luaL_optnumber(L, 3, 0);
+       off_t len = (off_t)luaL_optinteger(L, 3, 0);
        int stat;
 
        int cmd = 0;

diff --git a/libs/nixio/src/fs.c b/libs/nixio/src/fs.c
index 6ebfbaa421d24f7732b768bb1e96c7f044e62f18..53a406081ca527f3d6658a7b0efc7a4a20f7c1ef 100644 (file)
--- a/libs/nixio/src/fs.c
+++ b/libs/nixio/src/fs.c
@@ -257,14 +257,14 @@ static int nixio_utimes(lua_State *L) {
        if (lua_gettop(L) < 2 || (lua_isnoneornil(L, 2) && lua_isnoneornil(L, 3))) {
                return nixio__pstatus(L, !utimes(path, NULL));
        } else {
-               double atime = luaL_checknumber(L, 2);
-               double mtime = luaL_optnumber(L, 3, atime);
+               double atime = luaL_checkinteger(L, 2);
+               double mtime = luaL_optinteger(L, 3, atime);
                struct timeval times[2];
 
                times[0].tv_sec = atime;
-               times[0].tv_usec = (long)((atime - (int64_t)atime) * 1000000);
+               times[0].tv_usec = 0;
                times[1].tv_sec = mtime;
-               times[1].tv_usec = (long)((mtime - (int64_t)mtime) * 1000000);
+               times[1].tv_usec = 0;
 
                return nixio__pstatus(L, !utimes(path, times));
        }
@@ -317,7 +317,7 @@ int nixio__push_stat(lua_State *L, nixio_stat_t *buf) {
        lua_pushinteger(L, buf->st_rdev);
        lua_setfield(L, -2, "rdev");
 
-       lua_pushnumber(L, buf->st_size);
+       lua_pushinteger(L, buf->st_size);
        lua_setfield(L, -2, "size");
 
        lua_pushinteger(L, buf->st_atime);
@@ -469,37 +469,37 @@ static int nixio_glob(lua_State *L) {
 static int nixio__push_statvfs(lua_State *L, struct statvfs *buf) {
        lua_createtable(L, 0, 12);
 
-       lua_pushnumber(L, buf->f_bavail);
+       lua_pushinteger(L, buf->f_bavail);
        lua_setfield(L, -2, "bavail");
 
-       lua_pushnumber(L, buf->f_bfree);
+       lua_pushinteger(L, buf->f_bfree);
        lua_setfield(L, -2, "bfree");
 
-       lua_pushnumber(L, buf->f_blocks);
+       lua_pushinteger(L, buf->f_blocks);
        lua_setfield(L, -2, "blocks");
 
-       lua_pushnumber(L, buf->f_bsize);
+       lua_pushinteger(L, buf->f_bsize);
        lua_setfield(L, -2, "bsize");
 
-       lua_pushnumber(L, buf->f_frsize);
+       lua_pushinteger(L, buf->f_frsize);
        lua_setfield(L, -2, "frsize");
 
-       lua_pushnumber(L, buf->f_favail);
+       lua_pushinteger(L, buf->f_favail);
        lua_setfield(L, -2, "favail");
 
-       lua_pushnumber(L, buf->f_ffree);
+       lua_pushinteger(L, buf->f_ffree);
        lua_setfield(L, -2, "ffree");
 
-       lua_pushnumber(L, buf->f_files);
+       lua_pushinteger(L, buf->f_files);
        lua_setfield(L, -2, "files");
 
-       lua_pushnumber(L, buf->f_flag);
+       lua_pushinteger(L, buf->f_flag);
        lua_setfield(L, -2, "flag");
 
-       lua_pushnumber(L, buf->f_fsid);
+       lua_pushinteger(L, buf->f_fsid);
        lua_setfield(L, -2, "fsid");
 
-       lua_pushnumber(L, buf->f_namemax);
+       lua_pushinteger(L, buf->f_namemax);
        lua_setfield(L, -2, "namemax");
 
        return 1;

diff --git a/libs/nixio/src/io.c b/libs/nixio/src/io.c
index 8b8f25b424b15da82257d66a2d723072d8e16135..47fa0babb3d14f21faffed1136a6c47cf2d5f912 100644 (file)
--- a/libs/nixio/src/io.c
+++ b/libs/nixio/src/io.c
@@ -141,7 +141,7 @@ static int nixio_sock__recvfrom(lua_State *L, int from) {
                        nixio_addr naddr;
                        if (!nixio__addr_parse(&naddr, (struct sockaddr *)&addrobj)) {
                                lua_pushstring(L, naddr.host);
-                               lua_pushnumber(L, naddr.port);
+                               lua_pushinteger(L, naddr.port);
                                return 3;
                        } else {
                                return 1;

diff --git a/libs/nixio/src/nixio.c b/libs/nixio/src/nixio.c
index 5749b3bfbf57b9ce5650b195efb88689217f47dd..3086b978b3b35a812a953cd9d4bdef532970b9a0 100644 (file)
--- a/libs/nixio/src/nixio.c
+++ b/libs/nixio/src/nixio.c
@@ -147,7 +147,7 @@ NIXIO_API int luaopen_nixio(lua_State *L) {
        nixio_open_tls_socket(L);
 
        /* module version */
-       lua_pushnumber(L, VERSION);
+       lua_pushinteger(L, VERSION);
        lua_setfield(L, -2, "version");
 
        /* some constants */

diff --git a/libs/nixio/src/process.c b/libs/nixio/src/process.c
index 0e8ac8a2971b3a234b68102b5879b0a7622753a5..f3bb2f4006ea729fb1c7fcb538e64699aa0ebe68 100644 (file)
--- a/libs/nixio/src/process.c
+++ b/libs/nixio/src/process.c
@@ -225,16 +225,16 @@ static int nixio_times(lua_State *L) {
                return nixio__perror(L);
        } else {
                lua_createtable(L, 0, 4);
-               lua_pushnumber(L, buf.tms_cstime);
+               lua_pushinteger(L, buf.tms_cstime);
                lua_setfield(L, -2, "cstime");
 
-               lua_pushnumber(L, buf.tms_cutime);
+               lua_pushinteger(L, buf.tms_cutime);
                lua_setfield(L, -2, "cutime");
 
-               lua_pushnumber(L, buf.tms_stime);
+               lua_pushinteger(L, buf.tms_stime);
                lua_setfield(L, -2, "stime");
 
-               lua_pushnumber(L, buf.tms_utime);
+               lua_pushinteger(L, buf.tms_utime);
                lua_setfield(L, -2, "utime");
 
                return 1;
@@ -365,16 +365,16 @@ static int nixio_sysinfo(lua_State *L) {
 
        lua_createtable(L, 0, 12);
 
-       lua_pushnumber(L, info.bufferram);
+       lua_pushinteger(L, info.bufferram);
        lua_setfield(L, -2, "bufferram");
 
-       lua_pushnumber(L, info.freehigh);
+       lua_pushinteger(L, info.freehigh);
        lua_setfield(L, -2, "freehigh");
 
-       lua_pushnumber(L, info.freeram);
+       lua_pushinteger(L, info.freeram);
        lua_setfield(L, -2, "freeram");
 
-       lua_pushnumber(L, info.freeswap);
+       lua_pushinteger(L, info.freeswap);
        lua_setfield(L, -2, "freeswap");
 
        lua_createtable(L, 0, 3);
@@ -384,25 +384,25 @@ static int nixio_sysinfo(lua_State *L) {
        }
        lua_setfield(L, -2, "loads");
 
-       lua_pushnumber(L, info.mem_unit);
+       lua_pushinteger(L, info.mem_unit);
        lua_setfield(L, -2, "mem_unit");
 
-       lua_pushnumber(L, info.procs);
+       lua_pushinteger(L, info.procs);
        lua_setfield(L, -2, "procs");
 
-       lua_pushnumber(L, info.sharedram);
+       lua_pushinteger(L, info.sharedram);
        lua_setfield(L, -2, "sharedram");
 
-       lua_pushnumber(L, info.totalhigh);
+       lua_pushinteger(L, info.totalhigh);
        lua_setfield(L, -2, "totalhigh");
 
-       lua_pushnumber(L, info.totalram);
+       lua_pushinteger(L, info.totalram);
        lua_setfield(L, -2, "totalram");
 
-       lua_pushnumber(L, info.totalswap);
+       lua_pushinteger(L, info.totalswap);
        lua_setfield(L, -2, "totalswap");
 
-       lua_pushnumber(L, info.uptime);
+       lua_pushinteger(L, info.uptime);
        lua_setfield(L, -2, "uptime");
 
        return 1;

diff --git a/libs/nixio/src/sockopt.c b/libs/nixio/src/sockopt.c
index c7fe9c297999d08a6a7ccb8a62ebea3658bd8d05..cede884ce4616d7748c16a4613a2b4aa31eb8a1f 100644 (file)
--- a/libs/nixio/src/sockopt.c
+++ b/libs/nixio/src/sockopt.c
@@ -204,7 +204,7 @@ static int nixio__gso_mreq6(lua_State *L, int fd, int level, int opt, int set) {
                                return nixio__perror_s(L);
                        }
                        lua_pushstring(L, buf);
-                       lua_pushnumber(L, val.ipv6mr_interface);
+                       lua_pushinteger(L, val.ipv6mr_interface);
                        return 2;
                }
        } else {

diff --git a/libs/nixio/src/splice.c b/libs/nixio/src/splice.c
index 0704dfd24fe27885436c409953e6b6eb115d3c78..b9be8e820a4517c5d548b0b1dc909316f475f682 100644 (file)
--- a/libs/nixio/src/splice.c
+++ b/libs/nixio/src/splice.c
@@ -88,7 +88,7 @@ static int nixio_splice(lua_State *L) {
                return nixio__perror(L);
        }
 
-       lua_pushnumber(L, spliced);
+       lua_pushinteger(L, spliced);
        return 1;
 }
 
@@ -148,7 +148,7 @@ static int nixio_sendfile(lua_State *L) {
        }
 #endif
 
-       lua_pushnumber(L, spliced);
+       lua_pushinteger(L, spliced);
        return 1;
 }
 

diff --git a/libs/nixio/src/user.c b/libs/nixio/src/user.c
index adfe1f4f65cba6a7960044b58c3ec650a020ce3a..bc2184f99cc6257cb4c37b18e4984950aa74116f 100644 (file)
--- a/libs/nixio/src/user.c
+++ b/libs/nixio/src/user.c
@@ -78,7 +78,7 @@ static int nixio_getgr(lua_State *L) {
        struct group *gr;
        errno = 0;
        if (lua_isnumber(L, 1)) {
-               gr = getgrgid(lua_tonumber(L, 1));
+               gr = getgrgid(lua_tointeger(L, 1));
        } else if (lua_isstring(L, 1)) {
                gr = getgrnam(lua_tostring(L, 1));
        } else if (lua_isnoneornil(L, 1)) {
@@ -131,7 +131,7 @@ static int nixio_getpw(lua_State *L) {
        struct passwd *pw;
        errno = 0;
        if (lua_isnumber(L, 1)) {
-               pw = getpwuid(lua_tonumber(L, 1));
+               pw = getpwuid(lua_tointeger(L, 1));
        } else if (lua_isstring(L, 1)) {
                pw = getpwnam(lua_tostring(L, 1));
        } else if (lua_isnoneornil(L, 1)) {