From 3f66d4e5fce2ac8105d361c2161fb555624c092b Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Thu, 30 Oct 2008 13:09:40 +0000 Subject: [PATCH] Replace some makes-you-want-to-slash-your-wrists-Code with something less harmful --- libs/sys/luasrc/sys.lua | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua index 5d119dbe9..2332cebd8 100644 --- a/libs/sys/luasrc/sys.lua +++ b/libs/sys/luasrc/sys.lua @@ -175,27 +175,21 @@ end -- @return String containing the memory used for buffering in kB -- @return String containing the free memory amount in kB function sysinfo() - local c1 = "cat /proc/cpuinfo|grep system\\ typ|cut -d: -f2 2>/dev/null" - local c2 = "uname -m 2>/dev/null" - 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 cpuinfo = luci.fs.readfile("/proc/cpuinfo") + local meminfo = luci.fs.readfile("/proc/meminfo") + + local system = cpuinfo:match("system typ.-:%s*([^\n]+)") local model = "" - local memtotal = tonumber(luci.util.trim(luci.util.exec(c5))) - local memcached = tonumber(luci.util.trim(luci.util.exec(c6))) - local memfree = tonumber(luci.util.trim(luci.util.exec(c7))) - local membuffers = tonumber(luci.util.trim(luci.util.exec(c8))) - - if system == "" then - system = luci.util.trim(luci.util.exec(c2)) - model = luci.util.trim(luci.util.exec(c3)) + local memtotal = tonumber(meminfo:match("MemTotal:%s*(%d+)")) + local memcached = tonumber(meminfo:match("\nCached:%s*(%d+)")) + local memfree = tonumber(meminfo:match("MemFree:%s*(%d+)")) + local membuffers = tonumber(meminfo:match("Buffers:%s*(%d+)")) + + if not system then + system = posix.uname("%m") + model = cpuinfo:match("model name.-:%s*([^\n]+)") else - model = luci.util.trim(luci.util.exec(c4)) + model = cpuinfo:match("cpu model.-:%s*([^\n]+)") end return system, model, memtotal, memcached, membuffers, memfree -- 2.11.0