Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

completion: quote strings passed to the shell 

The strings passed to the shell completion machinery need to be quoted.
This commit is contained in:
Daniel Hahler 2015-01-21 09:23:47 +01:00
parent 0469cb4481
commit 704cf21b68
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/awful/completion.lua.in
View File

@ -97,7 +97,9 @@ function completion.shell(command, cur_pos, ncomp, shell)
local shell_cmd local shell_cmd
if shell == "zsh" or (not shell and os.getenv("SHELL"):match("zsh$")) then if shell == "zsh" or (not shell and os.getenv("SHELL"):match("zsh$")) then
if comptype == "file" then if comptype == "file" then
shell_cmd = "/usr/bin/env zsh -c 'local -a res; res=( " .. words[cword_index] .. "* ); print -ln -- ${res[@]}'" -- NOTE: wrapped in ${} to make `${"~/.X"}*` work (`"~/X."*` does not).
shell_cmd = "/usr/bin/env zsh -c 'local -a res; res=( "
.. string.format('${%q}', words[cword_index]) .. "* ); print -ln -- ${res[@]}'"
else else
-- check commands, aliases, builtins, functions and reswords -- check commands, aliases, builtins, functions and reswords
shell_cmd = "/usr/bin/env zsh -c 'local -a res; ".. shell_cmd = "/usr/bin/env zsh -c 'local -a res; "..
@ -105,7 +107,7 @@ function completion.shell(command, cur_pos, ncomp, shell)
"\"${(k)commands[@]}\" \"${(k)aliases[@]}\" \"${(k)builtins[@]}\" \"${(k)functions[@]}\" \"${(k)reswords[@]}\" ".. "\"${(k)commands[@]}\" \"${(k)aliases[@]}\" \"${(k)builtins[@]}\" \"${(k)functions[@]}\" \"${(k)reswords[@]}\" "..
"${PWD}/*(:t)".. "${PWD}/*(:t)"..
"); ".. "); "..
"print -ln -- ${(M)res[@]:#"..words[cword_index].."*}'" "print -ln -- ${(M)res[@]:#" .. string.format('%q', words[cword_index]) .. "*}'"
end end
else else
if bashcomp_funcs[words[1]] then if bashcomp_funcs[words[1]] then
@ -116,7 +118,8 @@ function completion.shell(command, cur_pos, ncomp, shell)
"COMP_COUNT=" .. cur_pos .. "; COMP_CWORD=" .. cword_index-1 .. "; " .. "COMP_COUNT=" .. cur_pos .. "; COMP_CWORD=" .. cword_index-1 .. "; " ..
bashcomp_funcs[words[1]] .. "; __print_completions'" bashcomp_funcs[words[1]] .. "; __print_completions'"
else else
shell_cmd = "/usr/bin/env bash -c 'compgen -A " .. comptype .. " " .. words[cword_index] .. "'" shell_cmd = "/usr/bin/env bash -c 'compgen -A " .. comptype .. " "
.. string.format('%q', words[cword_index]) .. "'"
end end
end end
local c, err = io.popen(shell_cmd .. " | sort -u") local c, err = io.popen(shell_cmd .. " | sort -u")
@ -126,7 +129,7 @@ function completion.shell(command, cur_pos, ncomp, shell)
while true do while true do
local line = c:read("*line") local line = c:read("*line")
if not line then break end if not line then break end
if os.execute("test -d " .. line) == 0 then if os.execute("test -d " .. string.format('%q', line)) == 0 then
line = line .. "/" line = line .. "/"
end end
table.insert(output, bash_escape(line)) table.insert(output, bash_escape(line))