Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* luci/libs/core: use numeric entities in pcdata()

Browse source
This commit is contained in:
Jo-Philipp Wich 2008-10-24 19:15:09 +00:00
parent bf21777126
commit 9451a49408
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libs/core/luasrc/util.lua
View file

@ -34,7 +34,7 @@ local coroutine = require "coroutine"
local getmetatable, setmetatable = getmetatable, setmetatable local getmetatable, setmetatable = getmetatable, setmetatable
local rawget, rawset, unpack = rawget, rawset, unpack local rawget, rawset, unpack = rawget, rawset, unpack
local tostring, type, assert = tostring, type, assert local tostring, type, assert = tostring, type, assert
local ipairs, pairs, loadstring = ipairs, pairs, loadstring local ipairs, pairs, loadstring = ipairs, pairs, loadstring
local require, pcall, xpcall = require, pcall, xpcall local require, pcall, xpcall = require, pcall, xpcall
@ -162,7 +162,7 @@ end
function dumptable(t, maxdepth, i, seen) function dumptable(t, maxdepth, i, seen)
i = i or 0 i = i or 0
seen = seen or setmetatable({}, {__mode="k"}) seen = seen or setmetatable({}, {__mode="k"})
for k,v in pairs(t) do for k,v in pairs(t) do
perror(string.rep("\t", i) .. tostring(k) .. "\t" .. tostring(v)) perror(string.rep("\t", i) .. tostring(k) .. "\t" .. tostring(v))
if type(v) == "table" and (not maxdepth or i < maxdepth) then if type(v) == "table" and (not maxdepth or i < maxdepth) then
@ -195,11 +195,11 @@ end
-- @return String value containing the escaped data -- @return String value containing the escaped data
function pcdata(value) function pcdata(value)
return value and tostring(value):gsub("[&\"'<>]", { return value and tostring(value):gsub("[&\"'<>]", {
["&"] = "&amp;", ["&"] = "&#38;",
['"'] = "&quot;", ['"'] = "&#34;",
["'"] = "&apos;", ["'"] = "&#39;",
["<"] = "&lt;", ["<"] = "&#60;",
[">"] = "&gt;" [">"] = "&#62;"
}) })
end end
@ -406,7 +406,7 @@ end
function _serialize_table(t, seen) function _serialize_table(t, seen)
assert(not seen[t], "Recursion detected.") assert(not seen[t], "Recursion detected.")
seen[t] = true seen[t] = true
local data = "" local data = ""
local idata = "" local idata = ""
local ilen = 0 local ilen = 0
@ -425,7 +425,7 @@ function _serialize_table(t, seen)
for i = 1, ilen do for i = 1, ilen do
local v = serialize_data(t[i], seen) local v = serialize_data(t[i], seen)
idata = idata .. ( #idata > 0 and ", " or "" ) .. v idata = idata .. ( #idata > 0 and ", " or "" ) .. v
end end
return idata .. ( #data > 0 and #idata > 0 and ", " or "" ) .. data return idata .. ( #data > 0 and #idata > 0 and ", " or "" ) .. data
end end
@ -438,7 +438,7 @@ end
-- @see get_bytecode -- @see get_bytecode
function serialize_data(val, seen) function serialize_data(val, seen)
seen = seen or setmetatable({}, {__mode="k"}) seen = seen or setmetatable({}, {__mode="k"})
if val == nil then if val == nil then
return "nil" return "nil"
elseif type(val) == "number" then elseif type(val) == "number" then
@ -633,11 +633,11 @@ function execi(command)
return pp and function() return pp and function()
local line = pp:read() local line = pp:read()
if not line then if not line then
pp:close() pp:close()
end end
return line return line
end end
end end