mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-28 15:01:21 +02:00
Code

users/10979: ssh completion uses config file from -F if present

Browse Source
This commit is contained in:
Peter Stephenson 2006-11-14 12:12:03 +00:00
parent 81fe83008e
commit b50e035a8a
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-11-14 Peter Stephenson <pws@csr.com>
* users/10979: Completion/Unix/Command/_ssh: use config file
from -F option if present.
2006-11-13 Clint Adams <clint@zsh.org>
* 22998: Completion/Linux/_acpi: add -s to _arguments.

11
Completion/Unix/Command/_ssh
View File

@ -323,6 +323,8 @@ _ssh_users () {
_ssh_hosts () {
local -a config_hosts
local config
integer ind
if [[ "$IPREFIX" == *@ ]]; then
_combination -s '[:@]' my-accounts users-hosts "users=${IPREFIX/@}" hosts "$@"
@ -330,7 +332,12 @@ _ssh_hosts () {
_combination -s '[:@]' my-accounts users-hosts \
${opt_args[-l]:+"users=${opt_args[-l]:q}"} hosts "$@"
fi
if [[ -r "$HOME/.ssh/config" ]]; then
if (( ind = ${words[(I)-F]} )); then
config=$words[ind+1]
else
config="$HOME/.ssh/config"
fi
if [[ -r $config ]]; then
local IFS=$'\t ' key hosts host
while read key hosts; do
if [[ "$key" == (#i)host ]]; then
@ -341,7 +348,7 @@ _ssh_hosts () {
esac
done
fi
done < "$HOME/.ssh/config"
done < "$config"
if (( ${#config_hosts} )); then
_wanted hosts expl 'remote host name' \
compadd -M 'm:{a-zA-Z}={A-Za-z} r:|.=* r:|=*' "$@" $config_hosts