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

46075: drelo: prefer ip on linux for finding network interfaces

Browse source
This commit is contained in:
drelo 2020-06-19 15:27:40 +08:00 committed by Oliver Kiddle
parent c4540e154f
commit eec1c48a91
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2020-06-26 Oliver Kiddle <okiddle@yahoo.co.uk>
* 46075: drelo: Completion/Unix/Type/_find_net_interfaces:
prefer ip on linux for finding network interfaces
* 45895: oxiedi: Completion/Base/Utility/_sequence,
Test/Y01completion.ztst: ignore dedup patterns in _sequence

12
Completion/Unix/Type/_find_net_interfaces
View file

@ -22,11 +22,17 @@ case $OSTYPE in
darwin*|freebsd*|dragonfly*) net_intf_list=( $(ifconfig -l) ) ;;
irix*) net_intf_list=( ${${${(f)"$(/usr/etc/netstat -i)"}%% *}[2,-1]} ) ;;
*)
# linux's deprecated ifconfig may truncate long interface names
net_intf_list=( $(_call_program interfaces "ifconfig -a 2>/dev/null | sed -n 's/^\([^ :]*\).*/\1/p'") )
if (( $+commands[ip] )); then
# if ip is available, we can also show altnames
net_intf_list=( $(_call_program interfaces "ip link | sed -ne 's/^[0-9]\+: \([^:@]\+\).*/\1/p;t; s/^[\ ]\+altname \(.\+\)\$/\1/p'") )
else
# linux's deprecated ifconfig may truncate long interface names
net_intf_list=( $(_call_program interfaces "ifconfig -a 2>/dev/null | sed -n 's/^\([^ :]*\).*/\1/p'") )
fi
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
# However, we now use ip or ifconfig since it finds additional devices such
# as tunnels. So only do this if that didn't work.
typeset -gU net_intf_list
net_intf_list=( /proc/sys/net/ipv4/conf/*~*(all|default)(N:t) /sys/class/net/*(N:t) )