From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-37050-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 20809 invoked by alias); 2 Nov 2015 03:43:06 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 37050
Received: (qmail 17013 invoked from network); 2 Nov 2015 03:43:05 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM
	autolearn=ham autolearn_force=no version=3.4.0
From: Eric Cook <llua@gmx.com>
To: zsh-workers@zsh.org
Subject: [PATCH] _sockstat: minor improvements
Date: Sun,  1 Nov 2015 22:30:22 -0500
Message-Id: <1446435022-10982-1-git-send-email-llua@gmx.com>
X-Mailer: git-send-email 2.6.0
X-Provags-ID: V03:K0:Zx74+qu92IAx6uvI0PLwmhCyNztA1LYLL66RtXeP08+kN4tussG
 G822PiOeBEHA9MMvE5UbYRcuja1Sk+WusT4p2r+P7odnG0+9PqaZU1FK/Z1E6/nlTGiJ2Q/
 7m+hDVoNcS5KfB6CxxxajK8S0VjnaBhWZlgoA42yn0d5RBIzMVSxppkb4XU6IWADguaWb2/
 5/pm7CP4bkKBsL0AzWyOw==
X-UI-Out-Filterresults: notjunk:1;V01:K0:cMs/bdS7MTo=:1ECX/l11XXTiIY8mA2crB7
 EOEw7a7hHj+DrKNe2nH5CKjTmKoRiZTS0QJnpWSe8GFBS94ypibt2kK8za7P0cOk4n8K6Fk5A
 IKFoF/5AVmgmuO42o3swTNxvwWfbJ2sY1yIwJ3xzH+kyhqBx/laRaAeQHDN80Ad/YKmRNq4Zs
 qq7mTxOPadBsSQj4k+nsXGoXCmvEr6MgDERB1ujqtT/ZX0NfIzf+b8VZsYPbwoRtHPbwLQlvj
 Ln2wSMBdYHuulzfwL2VE6xEaSAMg5diFB0EawFoFNFbokyl49J9ZTxOOfUqhJTh011jh4EKzY
 i3gGwiy9mgWLtvCohO1XfJuYNwqqnzuqM761z/73KxiQh+ePTAjhNuMFCdIW07tBtJvSazCd0
 8IYLjrAhxBjRa9Sz+OGB0qgB/lMDV4dMgkjXhEb8Ik3Fcd9hoZOKLKvhQ6Ohq8byiw6cLWEDH
 siMnz6bt3b37ChIjRiMyAyiLIWGEiLZXz5xQA290wyqj5Ks5eUergnnGyMX5b6TRxwvHp7kaw
 PXUv1FFL2/3FkFToF8VdtpPMpyx/HbZYrd+aX8g9T97YcyumH1RDAicZB2vKBGvsNsgXrik94
 Rx/d/mtDRecqin9cPH3BFTnLMgw6ZdLUjB8fc53ejBvq8k8gxRyQ8IAUT1oYxyOnR9fiNZUWM
 JIZTP+3PhNkwJ7WFwmSaeHxuAVqv2d9y4vgQ4v+Nf5sD4I1iUiWsikf2ZK8lg3GdgibfTOEU/
 4SQe165cpnQ10NXI2Wwu2ttCQeKcJFAJQgml01YBfWBEJ3sTcd0EUmyVgJU=

allow -p, -P and -f's argument to be completed in the same word.

Complete -P's argument using /etc/protocols again, while allowing a
comma delimited list of protocols.
---
 Completion/BSD/Command/_sockstat | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/Completion/BSD/Command/_sockstat b/Completion/BSD/Command/_sockstat
index 1b11ba4..daad946 100644
--- a/Completion/BSD/Command/_sockstat
+++ b/Completion/BSD/Command/_sockstat
@@ -1,5 +1,6 @@
 #compdef sockstat
-local -a args
+local -a args protocols
+local proto
 
 case $OSTYPE in
   *bsd*)
@@ -8,27 +9,37 @@ case $OSTYPE in
       '-6[show AF_INET6 (IPv6) sockets]'
       '-c[show connected sockets]'
       '-l[show listening sockets]'
-      '*-p[specify port number]:port numbers (comma delimited)'
+      '*-p+[specify port number]:port numbers (comma delimited)'
       '-u[show AF_LOCAL (UNIX) sockets]'
     )
   ;|
   freebsd*)
+    for proto in ${${(M)${(f)"$(</etc/protocols)"}##[a-z0-9]*}}; do
+      case $proto in
+        *\#*)
+          protocols+=(${${${(j: :)${(q)=proto}}// *\# /\[}/%/\]})
+        ;;
+        *)
+          protocols+=(${${(j: :)${=proto}}// */})
+      esac
+    done
+
     args+=(
       '*-j[show sockets belonging to JID]: : _jails -0 -o jid'
       '-L[exclude loopback]'
-      '*-P[specify protocol]: :_sequence -s , _ports'
+      '*-P+[specify protocol]: : _values -s , protocols $protocols'
     )
   ;;
   netbsd*)
     args+=(
-      '*-f[only show specified address family]:address family:(inet inet6 local unix)'
+      '*-f+[only show specified address family]:address family:(inet inet6 local unix)'
       '-n[no symbolic names for addresses/ports]'
     )
   ;;
 esac
 
 if (( $#args )); then
-  _arguments -s -w $args
+  _arguments -s -w : $args
   return
 fi
 
-- 
2.6.0