Re: [PATCH] _find_net_interfaces: use /sys/class/net/* for interface names in linux

[Eric Cook <llua@xxxxxxx>]

On 08/11/2015 05:47 AM, Oliver Kiddle wrote:
> Eric Cook wrote:
>> I also wasn't able to find the type of tunnels mentioned in
>> http://www.zsh.org/mla/workers/2007/msg00111.html that doesn't show up
>> in /proc/sys/net/ipv4/conf/. Maybe at some point since then, that was
>> fixed. But to avoid some kind of regression /sys/class/net/ seems usable
>> for the time being.
> 
> One example, is aliases. So if you do something like
>   ifconfig eth0:1 192.168.42.37
> then ifconfig will show eth0:1 while /sys/class won't.

When i switched to parsing ip(8), those alias interface names were no longer being shown.

So the following patch removes the linux block in the case statement, yet again.
Use ifconfig, but with _call_program. If ifconfig doesn't find anything, fall back to
/proc/sys/net/ipv4/conf/* and now /sys/class/net/*.

diff --git a/Completion/Unix/Type/_find_net_interfaces b/Completion/Unix/Type/_find_net_interfaces
index 0c70335..32ab79b 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
+    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 ip or ifconfig since it finds additional devices such
+      # 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