Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: device cannot be completed after "ip link show dev"
- X-seq: zsh-users 20058
- From: Peter Stephenson <p.w.stephenson@xxxxxxxxxxxx>
- To: zsh-user <zsh-users@xxxxxxx>
- Subject: Re: device cannot be completed after "ip link show dev"
- Date: Tue, 31 Mar 2015 19:57:01 +0100
- In-reply-to: <20150330033930.GB2856@localhost.localdomain>
- List-help: <mailto:zsh-users-help@zsh.org>
- List-id: Zsh Users List <zsh-users.zsh.org>
- List-post: <mailto:zsh-users@zsh.org>
- Mailing-list: contact zsh-users-help@xxxxxxx; run by ezmlm
- References: <20150330033930.GB2856@localhost.localdomain>
On Mon, 30 Mar 2015 11:39:30 +0800
Han Pingtian <hanpt@xxxxxxxxxxxxxxxxxx> wrote:
> Although in _ip() the "link_show_cmds" is defined to
>
> 188 local -a link_show_cmds
> 189 _regex_words link-show-commands 'link show commands' \
> 190 'dev:specify device:$subcmd_dev' \
> 191 'up:limit display to running devices'
> 192 link_show_cmds=("(" $subcmd_dev "|" ")" "$reply[@]" "#" )
> 193
>
> but the device cannot be completed after "ip link show dev":
I see the problem: we're matching way too much where we think there
might be a dev already on the command line.
This is better. There's still a possible glitch: if a device springs
into existence dynamically we won't accept it as a device already part
of the command line argument, though we will still complete it as that
calls _net_interfaces again. I think that's fairly minor.
pws
diff --git a/Completion/Unix/Command/_ip b/Completion/Unix/Command/_ip
index 3b68c35..bfa7d99 100644
--- a/Completion/Unix/Command/_ip
+++ b/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)')
diff --git a/Completion/Unix/Type/_find_net_interfaces b/Completion/Unix/Type/_find_net_interfaces
index e69de29..1f5ca9e 100644
--- a/Completion/Unix/Type/_find_net_interfaces
+++ 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 2cac3e3..5be66d7 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%%:*}"
Messages sorted by:
Reverse Date,
Date,
Thread,
Author