Clean up data types, some header cleanup, etc.

[proxmark3-svn] / client / cmdparser.c

diff --git a/client/cmdparser.c b/client/cmdparser.c
index b91f2c9e86abd07665fc051384f1422fb43afc65..6bb0416467fd6dbf5af760801f555ac40d2205b1 100644 (file)
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -25,8 +25,24 @@ void CmdsParse(const command_t Commands[], const char *Cmd)
   int i = 0;
   while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name))
     ++i;
   int i = 0;
   while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name))
     ++i;

+
+  /* try to find exactly one prefix-match */
+  if(!Commands[i].Name) {
+    int last_match = 0;
+    int matches = 0;
+
+    for(i=0;Commands[i].Name;i++) {
+      if( !strncmp(Commands[i].Name, cmd_name, strlen(cmd_name)) ) {
+        last_match = i;
+        matches++;
+      }
+    }
+    if(matches == 1) i=last_match;
+  }
+

   if (Commands[i].Name)
     Commands[i].Parse(Cmd + len);
   else
   if (Commands[i].Name)
     Commands[i].Parse(Cmd + len);
   else

-    PrintAndLog("Command not found");
+    // show help (always first in array) for selected hierarchy or if command not recognised
+    CmdsHelp(Commands);

 }
 }