diff options
| author | Eric Cook <llua@gmx.com> | 2015-08-13 16:10:35 +0200 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2015-08-13 16:10:35 +0200 |
| commit | f158e5c4cf7480447f3a4837f729e4dfeedd3317 (patch) | |
| tree | d94807df0345be187402fb422e5152f4fd98a2dc | |
| parent | 8e0b5e0e009271a7a9fc371e7278e9d9de22cfb3 (diff) | |
| download | zsh-f158e5c4cf7480447f3a4837f729e4dfeedd3317.tar.gz zsh-f158e5c4cf7480447f3a4837f729e4dfeedd3317.tar.xz zsh-f158e5c4cf7480447f3a4837f729e4dfeedd3317.zip | |
36113: ip(8) may add suffixes which is not good for completion matches
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Type/_find_net_interfaces | 19 |
2 files changed, 9 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index 1c847dbbc..104ac2c73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-08-13 Oliver Kiddle <opk@zsh.org> + * Eric Cook: 36113: Completion/Unix/Type/_find_net_interfaces: + ip(8) may add suffixes which is not good for completion matches + * Wieland Hoffmann: 36123: Completion/Unix/Command/_git: protect against word splitting in __git_is_committish_range diff --git a/Completion/Unix/Type/_find_net_interfaces b/Completion/Unix/Type/_find_net_interfaces index 0c7033519..3f5db6b9a 100644 --- a/Completion/Unix/Type/_find_net_interfaces +++ b/Completion/Unix/Type/_find_net_interfaces @@ -21,22 +21,15 @@ case $OSTYPE in ;; darwin*|freebsd*|dragonfly*) net_intf_list=( $(ifconfig -l) ) ;; irix*) net_intf_list=( ${${${(f)"$(/usr/etc/netstat -i)"}%% *}[2,-1]} ) ;; - *linux*) - if (( $+commands[ip] )); then - net_intf_list=( ${${(m)${(f)"$(ip -o link)"}#*: }%%: *} ) - fi - ;& - *) - if [[ ${#net_intf_list} -eq 0 ]]; then # linux's deprecated ifconfig may truncate long interface names - net_intf_list=( $(ifconfig -a 2>/dev/null | sed -n 's/^\([^ :]*\).*/\1/p') ) - if [[ -d /proc/sys/net/ipv4/conf ]]; then - # On linux we used to use the following as the default. - # However, we now use ip or ifconfig since it finds additional devices such + net_intf_list=( $(_call_program interfaces "ifconfig -a 2>/dev/null | sed -n 's/^\([^ :]*\).*/\1/p'") ) + if (( ${#net_intf_list} == 0 )) && [[ -d /proc/sys/net/ipv4/conf ]]; then + # On linux we used to use the following as the default, without /sys/class/net/*. + # However, we now use ifconfig since it finds additional devices such # as tunnels. So only do this if that didn't work. - net_intf_list=( /proc/sys/net/ipv4/conf/*~*(all|default)(N:t) ) + typeset -gU net_intf_list + net_intf_list=( /proc/sys/net/ipv4/conf/*~*(all|default)(N:t) /sys/class/net/*(N:t) ) fi - fi ;; esac |