* Fixed ffluci.util.trim, ffluci.util.split

[project/luci.git] / core / src / ffluci / util.lua

diff --git a/core/src/ffluci/util.lua b/core/src/ffluci/util.lua
index dfc88e3e41fd1cf552ff8f21c10a76d44853994d..3ff7bc2033f5e7a970e4ab6fccc47e29e6dc3b3f 100644 (file)
--- a/core/src/ffluci/util.lua
+++ b/core/src/ffluci/util.lua
@@ -145,39 +145,40 @@ function sessionid()
 end
 
 
--- Splits a string into an array (Adapted from lua-users.org)
-function split(str, pat, max)
+-- Splits a string into an array
+function split(str, pat, max, regex)
        pat = pat or "\n"
-       max = max or -1
+       max = max or #str
        
        local t = {}
-       local fpat = "(.-)" .. pat
-       local last_end = 1
-       local s, e, cap = str:find(fpat, 1)
+       local c = 1
        
-       while s do
-               max = max - 1
-               if s ~= 1 or cap ~= "" then
-                       table.insert(t,cap)
-               end
-               last_end = e+1
-               if max == 0 then
-                       break
-               end
-               s, e, cap = str:find(fpat, last_end)
+       if #str == 0 then
+               return {""}
        end
        
-       if last_end <= #str then
-               cap = str:sub(last_end)
-               table.insert(t, cap)
+       if #pat == 0 then
+               return nil
        end
        
+       if max == 0 then
+               return str
+       end
+       
+       repeat
+               local s, e = str:find(pat, c, not regex)
+               table.insert(t, str:sub(c, s and s - 1))
+               max = max - 1
+               c = e and e + 1 or #str + 1
+       until not s or max < 0
+       
        return t
 end
 
 -- Removes whitespace from beginning and end of a string
-function trim (string)
-       return string:gsub("^%s*(.-)%s*$", "%1")
+function trim(string)
+       local s = string:gsub("^%s*(.-)%s*$", "%1")
+       return s
 end
 
 -- Updates given table with new values