* fix escaping of magic lua chars (#2800)
* fix redundant second gsub line in shellstartsqescape function
* fix return value of shellstartsqescape function
Signed-off-by: Dirk Brenken <dev@brenken.org>
function pwd.write(self, section, value)
local pass
function pwd.write(self, section, value)
local pass
- if string.match(value, "^\$%d\$.*") then
+ if string.match(value, "^%$%d%$.*") then
pass = value
else
local t = tonumber(nixio.getpid()*os.time())
pass = value
else
local t = tonumber(nixio.getpid()*os.time())
end
function phonedigit(val)
end
function phonedigit(val)
- return (val:match("^[0-9\*#!%.]+$") ~= nil)
+ return (val:match("^[0-9%*#!%.]+$") ~= nil)
end
function timehhmmss(val)
end
function timehhmmss(val)
-- handling. It may actually be a property of the getopt function
-- rather than the shell proper.
function shellstartsqescape(value)
-- handling. It may actually be a property of the getopt function
-- rather than the shell proper.
function shellstartsqescape(value)
- res, _ = string.gsub(value, "^\-", "\\-")
- res, _ = string.gsub(res, "^-", "\-")
- return shellsqescape(value)
+ res, _ = string.gsub(value, "^%-", "\\-")
+ return shellsqescape(res)
end
-- containing the resulting substrings. The optional max parameter specifies
end
-- containing the resulting substrings. The optional max parameter specifies