libs/sys: fix luci.sys.processes.list() for entries with spaces i nthe STAT column (#528)

1 files changed, 16 insertions, 25 deletions

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index 825092fff..18622da77 100644
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -695,38 +695,29 @@ end
 function process.list()
 	local data = {}
 	local k
-	local ps = luci.util.execi("top -bn1")
+	local ps = luci.util.execi("/bin/busybox top -bn1")
 
 	if not ps then
 		return
 	end
 
-	while true do
-		local line = ps()
-		if not line then
-			return
-		end
-
-		k = luci.util.split(luci.util.trim(line), "%s+", nil, true)
-		if k[6] == "%VSZ" then
-			k[6] = "%MEM"
-		end
-		if k[1] == "PID" then
-			break
-		end
-	end
-
 	for line in ps do
-		local row = {}
-
-		line = luci.util.trim(line)
-		for i, value in ipairs(luci.util.split(line, "%s+", #k-1, true)) do
-			row[k[i]] = value
-		end
+		local pid, ppid, user, stat, vsz, mem, cpu, cmd = line:match(
+			"^ *(%d+) +(%d+) +(%S.-%S) +([RSDZTW][W ][<N ]) +(%d+) +(%d+%%) +(%d+%%) +(.+)"
+		)
 
-		local pid = tonumber(row[k[1]])
-		if pid then
-			data[pid] = row
+		local idx = tonumber(pid)
+		if idx then
+			data[idx] = {
+				['PID']     = pid,
+				['PPID']    = ppid,
+				['USER']    = user,
+				['STAT']    = stat,
+				['VSZ']     = vsz,
+				['%MEM']    = mem,
+				['%CPU']    = cpu,
+				['COMMAND'] = cmd
+			}
 		end
 	end