users/20058: improve device completion in ip completion.

We were too eager to regard strings already on the command line
as possible devices.

ChangeLog

@@ -1,3 +1,10 @@
+2015-03-31  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* users/20058: Completion/Unix/Command/_ip,
+	Completion/Unix/Type/_find_net_interfaces,
+	Completion/Unix/Type/_net_interfaces: improve matching of
+	devices already on command line in ip completion.
+
 2015-03-29  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 34817: Src/hist.c, Src/lex.c: catch some errors earlier when

Completion/Unix/Command/_ip

@@ -8,8 +8,11 @@
 #
 # Values encoding simple types
 #
-local -a subcmd_dev
-subcmd_dev=(/$'[[:alnum:][:punct:][:cntrl:][:digit:]]##\0'/ ':interfaces:network interface:_net_interfaces')
+local -a subcmd_dev net_intf_disp net_intf_list
+# subcmd_dev=(/$'[[:alnum:][:punct:][:cntrl:][:digit:]]##\0'/ ':interfaces:network interface:_net_interfaces')
+_find_net_interfaces
+subcmd_dev=(/"(${(j.|.)net_intf_list})"$'\0'/
+	    ':interfaces:network interface:_net_interfaces')
 
 local -a subcmd_onoff
 subcmd_onoff=(/$'(on|off)\0'/ ':onoff:state (on or off):(on off)')

Completion/Unix/Type/_find_net_interfaces

@@ -0,0 +1,42 @@
+#autoload
+
+# This can be called independently of completion.  It returns
+# arrays net_intf_disp and net_intf_list which the caller should
+# make local.
+
+local sep list
+
+# Make sure needed tools are in the path.
+local PATH=$PATH
+PATH=/sbin:$PATH
+
+case $OSTYPE in
+  aix*)
+    net_intf_list=( ${(f)"$(lsdev -C -c if -F 'name:description')"} )
+    if zstyle -T ":completion:${curcontext}" verbose; then
+      zstyle -s ":completion:${curcontext}:" list-separator sep || sep=--
+      zformat -a list " $sep " "$net_intf_list[@]"
+      net_intf_disp=(-ld list)
+    fi
+  ;;
+  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
+      # as tunnels.  So only do this if that didn't work.
+      net_intf_list=( /proc/sys/net/ipv4/conf/*~*(all|default)(N:t) )
+    fi
+  fi
+  ;;
+esac

Completion/Unix/Type/_net_interfaces

@@ -1,42 +1,9 @@
 #compdef ifup ifdown
 
-local expl list intf sep
-local -a disp
+local expl
+local -a net_intf_disp net_intf_list
 
-# Make sure needed tools are in the path.
-local PATH=$PATH
-PATH=/sbin:$PATH
-
-case $OSTYPE in
-  aix*)
-    intf=( ${(f)"$(lsdev -C -c if -F 'name:description')"} )
-    if zstyle -T ":completion:${curcontext}" verbose; then
-      zstyle -s ":completion:${curcontext}:" list-separator sep || sep=--
-      zformat -a list " $sep " "$intf[@]"
-      disp=(-ld list)
-    fi
-  ;;
-  darwin*|freebsd*|dragonfly*) intf=( $(ifconfig -l) ) ;;
-  irix*) intf=( ${${${(f)"$(/usr/etc/netstat -i)"}%% *}[2,-1]} ) ;;
-  *linux*)
-    if (( $+commands[ip] )); then
-      intf=( ${${(m)${(f)"$(ip -o link)"}#*: }%%: *} )
-    fi
-  ;&
-
-  *)
-  if [[ ${#intf} -eq 0 ]]; then
-    # linux's deprecated ifconfig may truncate long interface names
-    intf=( $(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
-      # as tunnels.  So only do this if that didn't work.
-      intf=( /proc/sys/net/ipv4/conf/*~*(all|default)(N:t) )
-    fi
-  fi
-  ;;
-esac
+_find_net_interfaces
 
 _wanted interfaces expl 'network interface' \
-    compadd "$@" "$disp[@]" - "${(@)intf%%:*}"
+    compadd "$@" "$net_intf_disp[@]" - "${(@)net_intf_list%%:*}"