Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace some makes-you-want-to-slash-your-wrists-Code with something less harmful

Browse source
This commit is contained in:
Steven Barth 2008-10-30 13:09:40 +00:00
parent 062eea6b4b
commit 3f66d4e5fc
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libs/sys/luasrc/sys.lua
View file

@ -175,27 +175,21 @@ end
-- @return String containing the memory used for buffering in kB -- @return String containing the memory used for buffering in kB
-- @return String containing the free memory amount in kB -- @return String containing the free memory amount in kB
function sysinfo() function sysinfo()
local c1 = "cat /proc/cpuinfo|grep system\\ typ|cut -d: -f2 2>/dev/null" local cpuinfo = luci.fs.readfile("/proc/cpuinfo")
local c2 = "uname -m 2>/dev/null" local meminfo = luci.fs.readfile("/proc/meminfo")
local c3 = "cat /proc/cpuinfo|grep model\\ name|cut -d: -f2 2>/dev/null"
local c4 = "cat /proc/cpuinfo|grep cpu\\ model|cut -d: -f2 2>/dev/null"
local c5 = "cat /proc/meminfo|grep MemTotal|awk {' print $2 '} 2>/dev/null"
local c6 = "cat /proc/meminfo|grep ^Cached|awk {' print $2 '} 2>/dev/null"
local c7 = "cat /proc/meminfo|grep MemFree|awk {' print $2 '} 2>/dev/null"
local c8 = "cat /proc/meminfo|grep Buffers|awk {' print $2 '} 2>/dev/null"
local system = luci.util.trim(luci.util.exec(c1)) local system = cpuinfo:match("system typ.-:%s*([^\n]+)")
local model = "" local model = ""
local memtotal = tonumber(luci.util.trim(luci.util.exec(c5))) local memtotal = tonumber(meminfo:match("MemTotal:%s*(%d+)"))
local memcached = tonumber(luci.util.trim(luci.util.exec(c6))) local memcached = tonumber(meminfo:match("\nCached:%s*(%d+)"))
local memfree = tonumber(luci.util.trim(luci.util.exec(c7))) local memfree = tonumber(meminfo:match("MemFree:%s*(%d+)"))
local membuffers = tonumber(luci.util.trim(luci.util.exec(c8))) local membuffers = tonumber(meminfo:match("Buffers:%s*(%d+)"))
if system == "" then if not system then
system = luci.util.trim(luci.util.exec(c2)) system = posix.uname("%m")
model = luci.util.trim(luci.util.exec(c3)) model = cpuinfo:match("model name.-:%s*([^\n]+)")
else else
model = luci.util.trim(luci.util.exec(c4)) model = cpuinfo:match("cpu model.-:%s*([^\n]+)")
end end
return system, model, memtotal, memcached, membuffers, memfree return system, model, memtotal, memcached, membuffers, memfree