From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-39464-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 5909 invoked by alias); 27 Sep 2016 12:50: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: 39464
Received: (qmail 8763 invoked from network); 27 Sep 2016 12:50:06 -0000
X-Qmail-Scanner-Diagnostics: from nm4-vm6.bullet.mail.ir2.yahoo.com by f.primenet.com.au (envelope-from <okiddle@yahoo.co.uk>, uid 7791) with qmail-scanner-2.11 
 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1.  
 Clear:RC:0(212.82.96.104):SA:0(0.0/5.0):. 
 Processed in 0.365009 secs); 27 Sep 2016 12:50:06 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM,SPF_PASS,
	T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1
X-Envelope-From: okiddle@yahoo.co.uk
X-Qmail-Scanner-Mime-Attachments: |
X-Qmail-Scanner-Zip-Files: |
Received-SPF: pass (ns1.primenet.com.au: SPF record at _spf.mail.yahoo.com designates 212.82.96.104 as permitted sender)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1474980221; bh=Xfpmtc43dxrZiIXMxZ7xSn7Z/YYNiiKsX/j8KSWUQMs=; h=From:To:Subject:Date:From:Subject; b=JnfGy4eyi5szs2dQsdYkurxROC9MAUg2THx9z0716aCivCdWyzI0DgYYbhO1SAIToNk4KmraPVQas07VqlMdzmf7qEcqnyeiecUR53zzCEsp9WEmOKBoEODvlwnOOdYrv4YHfggQhR5AH9NtNlq3qYew2hBUefvV+Xubpz9zHVGcjv9UC18ylycB9TXpSemgihA+RKhPwqgc5Boq7ERJhD5ljWj785RYzgpJZm40el8zgQBtuir1os0VT0G097Z1hYekMJ1aMlBZT3wlQK1uPva4gC17KmZdrTrrA++/6ZN08x4qwN2GWPgMREubv+XbWoj+iqWa4kZt6gj63XV98Q==
X-Yahoo-Newman-Id: 573634.39421.bm@smtp114.mail.ir2.yahoo.com
X-Yahoo-Newman-Property: ymail-3
X-YMail-OSG: NYd3uh0VM1mxe.s6nHT6J_1x92LIIOsGV_CcMAUx0STiWeN
 u1wdTienA1FtelVnyAyiVII8ZCV2WkWOBehvxGFoNuNE4.cAJEyMBfkIDWk.
 V70w_T5BnA9IrnguSGY4NnYHFyHO.ywJ_O6uYnGTkPGEGoAmDH7Ihb17zupT
 Naz17VIanASK1kKjkGbexinJmKumRPsTmBvvjPB8GM5940MUgyPxweue3.we
 5AuZH0Xd9NSxhNsNdRscKMX5Rv5Ph1awRKblHSr72noBDm36SDhf3BMNmO4k
 wgZ0xkvp3H0.w8TS4NUf_HFDkEO3Z6lxm2Fgu7eVJofa6QeDL8c5qWUP2aIk
 rCESsgsFncTRmovx_WX33EJ1hKGqDOwdcxmVPWDyQwXE1AknwuS8GFBIqM_k
 Sznkh6YBLV7.nOmOUVQ.QjEYtMGvvG5Nn4IV8jLeJATWUV7FZ.XyYwzKvT4S
 eoyyxHVzFLuBYDFR2i1BOERB7t6wWBrZX5l_A4VNly4SMhPNpsb3qQVf8k_6
 b5rFmDwRIPatb_wzrzuZqK9.P2CeZYWtnfr8PQEQCwFc-
X-Yahoo-SMTP: opAkk_CswBAce_kJ3nIPlH80cJI-
From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: Zsh workers <zsh-workers@zsh.org>
Subject: PATCH: fmadm (solaris) completion
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <25527.1474980220.1@hydra.kiddle.eu>
Date: Tue, 27 Sep 2016 14:43:40 +0200
Message-ID: <25528.1474980220@hydra.kiddle.eu>

Apparently the list subcommand is the same as faulty so should accept -g
and -n options. Also, it needs to check $state otherwise the filename
fallback completion gets triggered when there is no subcommand.

Oliver

diff --git a/Completion/Solaris/Command/_fmadm b/Completion/Solaris/Command/_fmadm
index 2a28f7a..54e22bd 100644
--- a/Completion/Solaris/Command/_fmadm
+++ b/Completion/Solaris/Command/_fmadm
@@ -43,6 +43,7 @@ _arguments -C -A "-*" \
   '1:fmadm subcommand:compadd -M "r:|-=* r:|=*" -a subcmds' \
   '*::command:->subcmd' && ret=0
 
+[[ -z $state ]] && return ret
 service="$words[1]"
 curcontext="${curcontext%:*}-$service:"
 
@@ -59,14 +60,14 @@ case $service in
     )
   ;|
 
-  (faulty)
+  (list|faulty)
     _arguments -A "-*" $args \
       '-a[display all faults]' \
       '-g[group faults]' \
-      '-n[limit output to n entries]:number'
+      '-n[limit output to specified number of entries]:number'
   ;;
 
-  (list|list-alert|list-defect|list-fault)
+  (list-alert|list-defect|list-fault)
     _arguments -A "-*" $args \
       '-a[display all resources]'
   ;;