39464: fix where lack of $state check caused unwanted filename completion for fmadm

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3fe3165ed..d401a0aa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-30  Oliver Kiddle  <opk@zsh.org>
+
+	* 39464: Completion/Solaris/Command/_fmadm: fix where lack
+	of $state check caused unwanted filename completion
+
 2016-09-29  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 39507: Doc/Zsh/params.yo, Src/exec.c: TMPSUFFIX for =(...)
diff --git a/Completion/Solaris/Command/_fmadm b/Completion/Solaris/Command/_fmadm
index 2a28f7a5c..54e22bde4 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]'
   ;;