[multipathd] allow shortcut in CLI syntax

For example "li maps topo" is allowed and synonymous of "list maps
topology".

1 files changed, 19 insertions, 7 deletions

diff --git a/multipathd/cli.c b/multipathd/cli.c
index fa24187..c723747 100644
--- a/multipathd/cli.c
+++ b/multipathd/cli.c
@@ -151,14 +151,26 @@ static struct key *
 find_key (char * str)
 {
 	int i;
+	int len, klen;
 	struct key * kw = NULL;
-
-	vector_foreach_slot (keys, kw, i)
-		if (strlen(str) == strlen(kw->str) &&
-		    !strcmp(kw->str, str))
-				return kw;
-
-	return NULL;
+	struct key * foundkw = NULL;
+
+	vector_foreach_slot (keys, kw, i) {
+		len = strlen(str);
+		klen = strlen(kw->str);
+
+		if (strncmp(kw->str, str, len))
+			continue;
+		else if (len == klen)
+			return kw; /* exact match */
+		else if (len < klen) {
+			if (!foundkw)
+				foundkw = kw; /* shortcut match */
+			else
+				return NULL; /* ambiguous word */
+		}
+	}
+	return foundkw;
 }
 		
 static struct handler *