From 3ef734ca72b7886a26a06d6b90381110864a1d42 Mon Sep 17 00:00:00 2001
From: Peter Stephenson
Date: Tue, 31 Mar 2015 20:10:08 +0100
Subject: users/20058: improve device completion in ip completion.
We were too eager to regard strings already on the command line
as possible devices.
---
Completion/Unix/Type/_find_net_interfaces | 42 +++++++++++++++++++++++++++++++
Completion/Unix/Type/_net_interfaces | 41 +++---------------------------
2 files changed, 46 insertions(+), 37 deletions(-)
create mode 100644 Completion/Unix/Type/_find_net_interfaces
(limited to 'Completion/Unix/Type')
diff --git a/Completion/Unix/Type/_find_net_interfaces b/Completion/Unix/Type/_find_net_interfaces
new file mode 100644
index 000000000..0c7033519
--- /dev/null
+++ b/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
diff --git a/Completion/Unix/Type/_net_interfaces b/Completion/Unix/Type/_net_interfaces
index 2cac3e3bb..5be66d7d1 100644
--- a/Completion/Unix/Type/_net_interfaces
+++ b/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%%:*}"
--
cgit 1.4.1