X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3ad48540d4d77f50cc62d16acb78f17019ef431d..347efc12741e72e6ce3a3c4f3ed554fae0cefc73:/client/cmdparser.c?ds=inline

diff --git a/client/cmdparser.c b/client/cmdparser.c
index 6910e86a..34230d52 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -8,12 +8,15 @@
 // Command parser
 //-----------------------------------------------------------------------------
 
+#include "cmdparser.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "ui.h"
-#include "cmdparser.h"
 #include "proxmark3.h"
+#include "comms.h"
+
 
 void CmdsHelp(const command_t Commands[])
 {
@@ -22,54 +25,57 @@ void CmdsHelp(const command_t Commands[])
   int i = 0;
   while (Commands[i].Name)
   {
-    if (!offline || Commands[i].Offline)
+    if (!IsOffline() || Commands[i].Offline)
        PrintAndLog("%-16s %s", Commands[i].Name, Commands[i].Help);
     ++i;
   }
 }
 
-void CmdsParse(const command_t Commands[], const char *Cmd)
+
+int CmdsParse(const command_t Commands[], const char *Cmd)
 {
-  if(strcmp( Cmd, "XX_internal_command_dump_XX") == 0)
-  {// Help dump children
-      dumpCommandsRecursive(Commands, 0);
-      return;
-  }
-  if(strcmp( Cmd, "XX_internal_command_dump_markdown_XX") == 0)
-  {// Markdown help dump children
-      dumpCommandsRecursive(Commands, 1);
-      return;
-  }
-  char cmd_name[32];
-  int len = 0;
-  memset(cmd_name, 0, 32);
-  sscanf(Cmd, "%31s%n", cmd_name, &len);
-  int i = 0;
-  while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name))
-    ++i;
+	if(strcmp( Cmd, "XX_internal_command_dump_XX") == 0)
+	{// Help dump children
+		dumpCommandsRecursive(Commands, 0);
+		return 0;
+	}
+	if(strcmp( Cmd, "XX_internal_command_dump_markdown_XX") == 0)
+	{// Markdown help dump children
+		dumpCommandsRecursive(Commands, 1);
+		return 0;
+	}
+	char cmd_name[32];
+	int len = 0;
+	memset(cmd_name, 0, 32);
+	sscanf(Cmd, "%31s%n", cmd_name, &len);
+	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;
-  }
+	/* try to find exactly one prefix-match */
+	if(!Commands[i].Name) {
+		int last_match = 0;
+		int matches = 0;
 
-  if (Commands[i].Name) {
-    while (Cmd[len] == ' ')
-      ++len;
-    Commands[i].Parse(Cmd + len);
-  } else {
-    // show help for selected hierarchy or if command not recognised
-    CmdsHelp(Commands);
-  }
+		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;
+	return Commands[i].Parse(Cmd + len);
+	} else {
+		// show help for selected hierarchy or if command not recognised
+		CmdsHelp(Commands);
+	}
+
+	return 0;
 }
 
 char pparent[512] = {0};