diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Type/_hosts | 23 |
2 files changed, 19 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index b2a7a9a5e..b30266ec4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-07-31 Daniel Shahaf <d.s@daniel.shahaf.name> + * 38967: Completion/Unix/Type/_hosts: Don't complete wildcard + entries from ~/.ssh/known_hosts. + * 38966: Completion/Unix/Command/_subversion: _svnadmin: Complete positional arguments for 'hotcopy', 'setlog', 'setrevprop', 'delrevprop'. diff --git a/Completion/Unix/Type/_hosts b/Completion/Unix/Type/_hosts index c3133dc68..56540865e 100644 --- a/Completion/Unix/Type/_hosts +++ b/Completion/Unix/Type/_hosts @@ -45,13 +45,22 @@ if ! zstyle -a ":completion:${curcontext}:hosts" hosts _hosts; then # known_hosts syntax supports the host being in the form [hostname]:port # The filter below extracts the hostname from lines using this format. - khosts=($(for host ($khosts); do - if [[ $host =~ "\[(.*)\]:\d*" ]]; then - echo $match - else - echo $host - fi - done)) + # + # known_hosts syntax supports wildcards. The filter below removes wildcard + # entries. + () { + local host + khosts=() + for host; do + if [[ $host == *[*?]* ]]; then + continue + elif [[ $host =~ "\[(.*)\]:\d*" ]]; then + khosts+=$match + else + khosts+=$host + fi + done + } "$khosts[@]" if [[ -z $useip ]]; then khosts=(${${khosts:#(#s)[0-9]##.[0-9]##.[0-9]##.[0-9]##(#e)}:#(#s)[0-9a-f:]##(#e)}) |