mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.pposix: Add pposix.uname(), bump version

Browse source
This commit is contained in:
Matthew Wild 2010-08-31 15:14:39 +01:00
parent c14f4168f2
commit 50b20f4af4
3 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_posix.lua
View file

@ -7,7 +7,7 @@
--
local want_pposix_version = "0.3.4";
local want_pposix_version = "0.3.5";
local pposix = assert(require "util.pposix");
if pposix._VERSION ~= want_pposix_version then module:log("warn", "Unknown version (%s) of binary pposix module, expected %s", tostring(pposix._VERSION), want_pposix_version); end

2
prosodyctl
View file

@ -79,7 +79,7 @@ require "util.datamanager".set_data_path(data_path);
-- Switch away from root and into the prosody user --
local switched_user, current_uid;
local want_pposix_version = "0.3.4";
local want_pposix_version = "0.3.5";
local ok, pposix = pcall(require, "util.pposix");
if ok and pposix then

27
util-src/pposix.c
View file

@ -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,28 @@ int lc_abort(lua_State* L)
return 0;
}
int lc_uname(lua_State* L)
{
struct utsname uname_info;
if(uname(&uname_info) != 0)
{
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 +605,8 @@ int luaopen_util_pposix(lua_State *L)
{ "setrlimit", lc_setrlimit },
{ "getrlimit", lc_getrlimit },
{ "uname", lc_uname },
{ NULL, NULL }
};