luci-0.8: merge r4476, r4477, r4585 and r4587

[project/luci.git] / libs / sys / luasrc / sys.lua

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index ad80ae5ba3fa4af47989b2df18f398651691aec2..9910ed37ceb0e0b2bf03e6baa9f2e1042a362dad 100644 (file)
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -691,13 +691,14 @@ function wifi.channels(iface)
        local fd = io.popen(cmd)
        if fd then
                local ln, c, f
-               repeat
-                       ln = fd:read("*l") or ""
+               while true do
+                       ln = fd:read("*l")
+                       if not ln then break end
                        c, f = ln:match("Channel (%d+) : (%d+%.%d+) GHz")
                        if c and f then
                                cns[tonumber(c)] = tonumber(f)
                        end
-               until not ( #ln > 0 )
+               end
                fd:close()
        end