From 55ff474dee5c2b20be89818294dc6903817134c9 Mon Sep 17 00:00:00 2001
From: spf13 <steve.francia@gmail.com>
Date: Sun, 29 Sep 2013 01:59:13 -0400
Subject: [PATCH] Finding command based on args cleaned up

---
 command.go | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/command.go b/command.go
index 7c3a0a9b..ce4557de 100644
--- a/command.go
+++ b/command.go
@@ -77,25 +77,37 @@ func (c *Command) resetChildrensParents() {
 
 // find the target command given the args and command tree
 // Meant to be run on the highest node. Only searches down.
-func (c *Command) Find(args []string) (cmd *Command, a []string, err error) {
+func (c *Command) Find(arrs []string) (*Command, []string, error) {
 	if c == nil {
 		return nil, nil, fmt.Errorf("Called find() on a nil Command")
 	}
 
-	validSubCommand := false
-	if len(args) > 0 && c.HasSubCommands() {
-		for _, cmd := range c.commands {
-			if cmd.Name() == args[0] {
-				validSubCommand = true
-				return cmd.Find(args[1:])
-			}
-		}
-	}
-	if !validSubCommand && c.Runnable() {
-		return c, args, nil
+	if len(arrs) == 0 {
+		return c.Commander().cmd, arrs, nil
 	}
 
-	return nil, nil, nil
+	var innerfind func(*Command, []string) (*Command, []string)
+
+	innerfind = func(c *Command, args []string) (*Command, []string) {
+		if len(args) > 0 && c.HasSubCommands() {
+			for _, cmd := range c.commands {
+				if cmd.Name() == args[0] {
+					return innerfind(cmd, args[1:])
+				}
+			}
+		}
+
+		return c, args
+	}
+
+	commandFound, a := innerfind(c, arrs)
+
+	// if commander returned and not appropriately matched return nil & error
+	if commandFound.Name() == c.Name() && commandFound.Name() != arrs[0] {
+		return nil, a, fmt.Errorf("Command not found")
+	}
+
+	return commandFound, a, nil
 }
 
 func (c *Command) Root() *Command {