diff options
| author | Oliver Kiddle <opk@zsh.org> | 2024-03-26 00:06:05 +0100 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2024-03-26 00:06:05 +0100 |
| commit | c7ae3701607a00162e19a7ba1e23aef3158acdd0 (patch) | |
| tree | f1040ba0e912637b84014f86c6c9b88a5c06df61 | |
| parent | b727b74fe23c532050b959fe4ce0382c7213af6b (diff) | |
| download | zsh-c7ae3701607a00162e19a7ba1e23aef3158acdd0.tar.gz zsh-c7ae3701607a00162e19a7ba1e23aef3158acdd0.tar.xz zsh-c7ae3701607a00162e19a7ba1e23aef3158acdd0.zip | |
52798: handle comments in ssh config
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_ssh | 3 | ||||
| -rw-r--r-- | Completion/Unix/Type/_ssh_hosts | 11 |
3 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 72e8efbe7..582f75635 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2024-03-25 Oliver Kiddle <opk@zsh.org> + + * 52798: Completion/Unix/Command/_ssh, + Completion/Unix/Type/_ssh_hosts: handle comments in ssh config + 2024-03-23 Mikael Magnusson <mikachu@gmail.com> * 52768: Completion/compdump, Completion/compinit: Handle diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh index dc3979a58..5e6e60573 100644 --- a/Completion/Unix/Command/_ssh +++ b/Completion/Unix/Command/_ssh @@ -101,6 +101,7 @@ _ssh () { '--apple-use-keychain[update keychain when adding/removing identities]' ) _arguments -C -s : $args \ + '-C[process certificates only]' \ '-c[identity is subject to confirmation via SSH_ASKPASS]' \ '-D[delete all identities]' \ '-d[remove identity]' \ @@ -214,7 +215,7 @@ _ssh () { "(${${(@)cmds:#-p}} -v ${${(@)cms:#-[qt]}})-N+[provide new passphrase]:new passphrase" \ "(${${(@)cmds:#-c}} -v $cms)-C+[provide new comment]:new comment" \ "(-D -I -h -n -V -A)-f+[$file file]:$file file:_files" \ - "$p1(${${(@)cmds:#-[FE]}} ${${(@)cmn:#-v}} ${${(@)cms:#-E}})-l[show fingerprint of key file]" \ + "(${${(@)cmds:#-[FE]}} ${${(@)cmn:#-v}} ${${(@)cms:#-E}})-l[show fingerprint of key file]" \ "$p1(${${(@)cmds:#-[iep]}} $cms)-m+[specify conversion format]:format [RFC4716]:(PEM PKCS8 RFC4716)" \ "$p1*-O+[specify a key/value option]: : _values 'option' $options" \ "(${${(@)cmds:#-[lGT]}} ${${(@)cmn:#-[bv]}} -f)*-v[verbose mode]" \ diff --git a/Completion/Unix/Type/_ssh_hosts b/Completion/Unix/Type/_ssh_hosts index a4a08ad91..b50e1c16a 100644 --- a/Completion/Unix/Type/_ssh_hosts +++ b/Completion/Unix/Type/_ssh_hosts @@ -24,7 +24,7 @@ if [[ -r $config ]]; then while (( idx <= $#lines )); do IFS=$'=\t ' read -r key line <<<"${lines[idx]}" if [[ "$key" == ((#i)match) ]]; then - match_args=(${(z)line}) + match_args=( ${(Z.C.)line} ) while [[ $#match_args -ge 2 ]]; do if [[ "${match_args[1]}" == (#i)(canonical|final|(|original)host) ]]; then key="Host" @@ -36,13 +36,10 @@ if [[ -r $config ]]; then fi case "$key" in ((#i)include) - lines[idx]=("${(@f)$(cd $HOME/.ssh; cat ${(z)~line})}") 2>/dev/null;; + lines[idx]=( "${(@f)$(cd $HOME/.ssh; cat ${(Z.C.)~line} 2>/dev/null)}" ) ;; ((#i)host(|name)) - for host in ${(z)line}; do - case $host in - (*[*?]*) ;; - (*) config_hosts+=("$host") ;; - esac + for host in ${(Z.C.)line}; do + [[ $host != *[*?%]* ]] && config_hosts+=( $host ) done ;& (*) (( ++idx ));; esac |