local ldebug = require "luci.debug"
local string = require "string"
local coroutine = require "coroutine"
-local cutil = require "luci.cutil"
local getmetatable, setmetatable = getmetatable, setmetatable
local rawget, rawset, unpack = rawget, rawset, unpack
local tostring, type, assert = tostring, type, assert
local ipairs, pairs, loadstring = ipairs, pairs, loadstring
local require, pcall, xpcall = require, pcall, xpcall
+local collectgarbage, get_memory_limit = collectgarbage, get_memory_limit
--- LuCI utility functions.
module "luci.util"
if not b then
return a
elseif type(b) == "table" then
+ for k, _ in pairs(b) do if type(b[k]) == "userdata" then b[k] = tostring(b[k]) end end
return a:format(unpack(b))
else
+ if type(b) == "userdata" then b = tostring(b) end
return a:format(b)
end
end
-- Scope manipulation routines
--
---- Create a new or get an already existing thread local store associated with
--- the current active coroutine. A thread local store is private a table object
--- whose values can't be accessed from outside of the running coroutine.
--- @return Table value representing the corresponding thread local store
-function threadlocal()
- local tbl = {}
-
- local function get(self, key)
- local c = coroutine.running()
- local thread = coxpt[c] or c or 0
- if not rawget(self, thread) then
- return nil
- end
- return rawget(self, thread)[key]
- end
+local tl_meta = {
+ __mode = "k",
+
+ __index = function(self, key)
+ local t = rawget(self, coxpt[coroutine.running()]
+ or coroutine.running() or 0)
+ return t and t[key]
+ end,
- local function set(self, key, value)
- local c = coroutine.running()
- local thread = coxpt[c] or c or 0
- if not rawget(self, thread) then
- rawset(self, thread, {})
+ __newindex = function(self, key, value)
+ local c = coxpt[coroutine.running()] or coroutine.running() or 0
+ if not rawget(self, c) then
+ rawset(self, c, { [key] = value })
+ else
+ rawget(self, c)[key] = value
end
- rawget(self, thread)[key] = value
end
+}
- setmetatable(tbl, {__index = get, __newindex = set, __mode = "k"})
-
- return tbl
+--- Create a new or get an already existing thread local store associated with
+-- the current active coroutine. A thread local store is private a table object
+-- whose values can't be accessed from outside of the running coroutine.
+-- @return Table value representing the corresponding thread local store
+function threadlocal(tbl)
+ return setmetatable(tbl or {}, tl_meta)
end
--- Create valid XML PCDATA from given string.
-- @param value String value containing the data to escape
-- @return String value containing the escaped data
-local _pcdata_repl = {
- ["&"] = "&",
- ['"'] = """,
- ["'"] = "'",
- ["<"] = "<",
- [">"] = ">"
-}
+local function _pcdata_repl(c)
+ local i = string.byte(c)
+
+ if ( i >= 0x00 and i <= 0x08 ) or ( i >= 0x0B and i <= 0x0C ) or
+ ( i >= 0x0E and i <= 0x1F ) or ( i == 0x7F )
+ then
+ return ""
+
+ elseif ( i == 0x26 ) or ( i == 0x27 ) or ( i == 0x22 ) or
+ ( i == 0x3C ) or ( i == 0x3E )
+ then
+ return string.format("&#%i;", i)
+ end
+
+ return c
+end
function pcdata(value)
- return value and tostring(value):gsub("[&\"'<>]", _pcdata_repl)
+ return value and tostring(value):gsub("[&\"'<>%c]", _pcdata_repl)
end
--- Strip HTML tags from given string.
-- @param value String containing the HTML text
-- @return String with HTML tags stripped of
function striptags(s)
- return pcdata(s:gsub("</?[A-Za-z][A-Za-z0-9:_%-]*[^>]*>", " "):gsub("%s+", " "))
+ return pcdata(tostring(s):gsub("</?[A-Za-z][A-Za-z0-9:_%-]*[^>]*>", " "):gsub("%s+", " "))
end
--- Splits given string on a defined separator sequence and return a table
return count
end
+--- Return a matching iterator for the given value. The iterator will return
+-- one token per invocation, the tokens are separated by whitespace. If the
+-- input value is a table, it is transformed into a string first. A nil value
+-- will result in a valid interator which aborts with the first invocation.
+-- @param val The value to scan (table, string or nil)
+-- @return Iterator which returns one token per call
+function imatch(v)
+ if v == nil then
+ v = ""
+ elseif type(v) == "table" then
+ v = table.concat(v, " ")
+ end
+
+ return v:gmatch("%S+")
+end
+
--- Parse certain units from the given string and return the canonical integer
-- value or 0 if the unit is unknown. Upper- or lower case is irrelevant.
-- Recognized units are:
code = string.dump( loadstring( "return " .. serialize_data(val) ) )
end
- return code and strip_bytecode(code)
+ return code -- and strip_bytecode(code)
end
--- Strips unnescessary lua bytecode from given string. Information like line
end
end
- local strip_function
- strip_function = function(code)
+ local function strip_function(code)
local count, offset = subint(code, 1, size)
- local stripped, dirty = string.rep("\0", size), offset + count
+ local stripped = { string.rep("\0", size) }
+ local dirty = offset + count
offset = offset + count + int * 2 + 4
offset = offset + int + subint(code, offset, int) * ins
count, offset = subint(code, offset, int)
end
end
count, offset = subint(code, offset, int)
- stripped = stripped .. code:sub(dirty, offset - 1)
+ stripped[#stripped+1] = code:sub(dirty, offset - 1)
for n = 1, count do
local proto, off = strip_function(code:sub(offset, -1))
- stripped, offset = stripped .. proto, offset + off - 1
+ stripped[#stripped+1] = proto
+ offset = offset + off - 1
end
offset = offset + subint(code, offset, int) * int + int
count, offset = subint(code, offset, int)
for n = 1, count do
offset = offset + subint(code, offset, size) + size
end
- stripped = stripped .. string.rep("\0", int * 3)
- return stripped, offset
+ stripped[#stripped+1] = string.rep("\0", int * 3)
+ return table.concat(stripped), offset
end
return code:sub(1,12) .. strip_function(code:sub(13,-1))
--- Returns the absolute path to LuCI base directory.
-- @return String containing the directory path
function libpath()
- return require "luci.fs".dirname(ldebug.__file__)
+ return require "nixio.fs".dirname(ldebug.__file__)
end
end
-- Handle return value of protected call
-function handleReturnValue(err, co, status, ...)
+function handleReturnValue(err, co, status, arg1, arg2, arg3, arg4, arg5)
if not status then
- return false, err(debug.traceback(co, (...)), ...)
+ return false, err(debug.traceback(co, arg1), arg1, arg2, arg3, arg4, arg5)
end
- if coroutine.status(co) == 'suspended' then
- return performResume(err, co, coroutine.yield(...))
- else
- return true, ...
+
+ if coroutine.status(co) ~= 'suspended' then
+ return true, arg1, arg2, arg3, arg4, arg5
end
+
+ return performResume(err, co, coroutine.yield(arg1, arg2, arg3, arg4, arg5))
end
-- Resume execution of protected function call
-function performResume(err, co, ...)
- return handleReturnValue(err, co, coroutine.resume(co, ...))
+function performResume(err, co, arg1, arg2, arg3, arg4, arg5)
+ return handleReturnValue(err, co, coroutine.resume(co, arg1, arg2, arg3, arg4, arg5))
end
projects / project / luci.git / blobdiff