cmdhf14b.c: fixing a crash in the crc computation when missing data (e.g. with 'hf...

[proxmark3-svn] / client / cmdparser.c

diff --git a/client/cmdparser.c b/client/cmdparser.c
index 74ae29bba30697c03502b0cd580b1506356b4a5c..7ea1bf47023d180b31dea6866164cedcfd5fda1c 100644 (file)
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -1,7 +1,18 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Command parser
+//-----------------------------------------------------------------------------
+

 #include <stdio.h>
 #include <string.h>
 #include "ui.h"
 #include "cmdparser.h"
 #include <stdio.h>
 #include <string.h>
 #include "ui.h"
 #include "cmdparser.h"

+#include "proxmark3.h"

 
 void CmdsHelp(const command_t Commands[])
 {
 
 void CmdsHelp(const command_t Commands[])
 {


@@ -25,9 +36,27 @@ 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;

-  if (Commands[i].Name)
+
+  /* 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) {
+    while (Cmd[len] == ' ')
+      ++len;

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

-  else
-    // show help (always first in array) for selected hierarchy or if command not recognised
+  } else {
+    // show help for selected hierarchy or if command not recognised

     CmdsHelp(Commands);
     CmdsHelp(Commands);

+  }

 }
 }