Merge 0.8->trunk

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

diff --git a/util-src/pposix.c b/util-src/pposix.c
index 1b1f85fd75d7c272bd303a4b12d134c7b430f03d..ffd2128835ddb9124cc8fb858a23be23e8e2734a 100644 (file)
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -13,7 +13,7 @@
 * POSIX support functions for Lua
 */
 
-#define MODULE_VERSION "0.3.4"
+#define MODULE_VERSION "0.3.5"
 
 #include <stdlib.h>
 #include <math.h>
@@ -22,6 +22,7 @@
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/utsname.h>
 #include <fcntl.h>
 
 #include <syslog.h>
@@ -553,6 +554,29 @@ int lc_abort(lua_State* L)
        return 0;
 }
 
+int lc_uname(lua_State* L)
+{
+       struct utsname uname_info;
+       if(uname(&uname_info) != 0)
+       {
+               lua_pushnil(L);
+               lua_pushstring(L, strerror(errno));
+               return 2;
+       }
+       lua_newtable(L);
+       lua_pushstring(L, uname_info.sysname);
+       lua_setfield(L, -2, "sysname");
+       lua_pushstring(L, uname_info.nodename);
+       lua_setfield(L, -2, "nodename");
+       lua_pushstring(L, uname_info.release);
+       lua_setfield(L, -2, "release");
+       lua_pushstring(L, uname_info.version);
+       lua_setfield(L, -2, "version");
+       lua_pushstring(L, uname_info.machine);
+       lua_setfield(L, -2, "machine");
+       return 1;
+}
+
 /* Register functions */
 
 int luaopen_util_pposix(lua_State *L)
@@ -582,6 +606,8 @@ int luaopen_util_pposix(lua_State *L)
                { "setrlimit", lc_setrlimit },
                { "getrlimit", lc_getrlimit },
 
+               { "uname", lc_uname },
+
                { NULL, NULL }
        };
 
@@ -594,4 +620,4 @@ int luaopen_util_pposix(lua_State *L)
        lua_setfield(L, -2, "_VERSION");
 
        return 1;
-};
+}