mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-04 10:41:11 +02:00
Code Releases Activity

36113: ip(8) may add suffixes which is not good for completion matches

Browse source
This commit is contained in:
Eric Cook 2015-08-13 16:10:35 +02:00 committed by Oliver Kiddle
parent 8e0b5e0e00
commit f158e5c4cf
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -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

19
Completion/Unix/Type/_find_net_interfaces
View file

@ -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