mirrors/argparse
1
0
Fork 0
mirror of https://github.com/TangentFoxy/argparse.git synced 2025-07-28 02:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Parser:_is_shell_safe

Browse Source
This commit is contained in:
Paul Ouellette
2019-07-22 17:37:25 -04:00
parent e6506bd408
commit 146dcd4ecd
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/argparse.lua
View File

@@ -1088,8 +1088,8 @@ function Parser:_is_shell_safe()
if self._name:find("[^%w_%-%+%.]") then if self._name:find("[^%w_%-%+%.]") then
return false return false
end end
for _, command in ipairs(self._commands) do if self._aliases then
for _, alias in ipairs(command._aliases) do for _, alias in ipairs(self._aliases) do
if alias:find("[^%w_%-%+%.]") then if alias:find("[^%w_%-%+%.]") then
return false return false
end end
@@ -1100,15 +1100,20 @@ function Parser:_is_shell_safe()
if alias:find("[^%w_%-%+%.]") then if alias:find("[^%w_%-%+%.]") then
return false return false
end end
if option._choices then end
for _, choice in ipairs(option._choices) do if option._choices then
if choice:find("[%s'\"]") then for _, choice in ipairs(option._choices) do
return false if choice:find("[%s'\"]") then
end return false
end end
end end
end end
end end
for _, command in ipairs(self._commands) do
if not command:_is_shell_safe() then
return false
end
end
return true return true
end end
@@ -1117,7 +1122,6 @@ function Parser:add_complete(value)
assert(type(value) == "string" or type(value) == "table", assert(type(value) == "string" or type(value) == "table",
("bad argument #1 to 'add_complete' (string or table expected, got %s)"):format(type(value))) ("bad argument #1 to 'add_complete' (string or table expected, got %s)"):format(type(value)))
end end
assert(self:_is_shell_safe())
local complete = self:option() local complete = self:option()
:description "Output a shell completion script for the specified shell." :description "Output a shell completion script for the specified shell."
@@ -1144,7 +1148,6 @@ function Parser:add_complete_command(value)
assert(type(value) == "string" or type(value) == "table", assert(type(value) == "string" or type(value) == "table",
("bad argument #1 to 'add_complete_command' (string or table expected, got %s)"):format(type(value))) ("bad argument #1 to 'add_complete_command' (string or table expected, got %s)"):format(type(value)))
end end
assert(self:_is_shell_safe())
local complete = self:command() local complete = self:command()
:description "Output a shell completion script." :description "Output a shell completion script."
@@ -1258,6 +1261,7 @@ function Parser:_bash_cmd_completions(buf)
end end
function Parser:get_bash_complete() function Parser:get_bash_complete()
assert(self:_is_shell_safe())
local buf = {([[ local buf = {([[
_%s() { _%s() {
local IFS=$' \t\n' local IFS=$' \t\n'
@@ -1387,6 +1391,7 @@ function Parser:_zsh_complete_help(buf, cmds_buf, cmd_name, indent)
end end
function Parser:get_zsh_complete() function Parser:get_zsh_complete()
assert(self:_is_shell_safe())
local buf = {("compdef _%s %s\n"):format(self._name, self._name)} local buf = {("compdef _%s %s\n"):format(self._name, self._name)}
local cmds_buf = {} local cmds_buf = {}
table.insert(buf, "_" .. self._name .. "() {") table.insert(buf, "_" .. self._name .. "() {")
@@ -1464,6 +1469,7 @@ function Parser:_fish_complete_help(buf, prefix)
end end
function Parser:get_fish_complete() function Parser:get_fish_complete()
assert(self:_is_shell_safe())
local buf = {} local buf = {}
local prefix = "complete -c " .. self._name local prefix = "complete -c " .. self._name
self:_fish_complete_help(buf, prefix) self:_fish_complete_help(buf, prefix)