X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/dec8e8bd9f67643c07af9b06f9d6e9e1a2fb9191..be67483e63430608982f1c92e02b59d7b4dc65b3:/client/cmdparser.c

diff --git a/client/cmdparser.c b/client/cmdparser.c
index 3820de17..5d0363ac 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -15,39 +15,32 @@
 #include "cmdparser.h"
 #include "proxmark3.h"
 
-void CmdsHelp(const command_t Commands[])
-{
-  if (Commands[0].Name == NULL)
-    return;
-  int i = 0;
-  while (Commands[i].Name)
-  {
-      if(Commands[i].Offline)
-      {
-        PrintAndLog("%-16s  \t%s", Commands[i].Name, Commands[i].Help);
-      }else
-      {
-        PrintAndLog("%-16s @\t%s", Commands[i].Name, Commands[i].Help);
-      }
-    ++i;
-  }
+void CmdsHelp(const command_t Commands[]) {
+	if (Commands[0].Name == NULL) return;
+	int i = 0;
+	while (Commands[i].Name) {
+		if (!offline || 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;
+	dumpCommandsRecursive(Commands, 0);
+	return 0;
   }
   if(strcmp( Cmd, "XX_internal_command_dump_markdown_XX") == 0)
   {// Markdown help dump children
-      dumpCommandsRecursive(Commands, 1);
-      return;
+     dumpCommandsRecursive(Commands, 1);
+	return 0;
   }
   char cmd_name[32];
   int len = 0;
-  memset(cmd_name, 0, 32);
+  memset(cmd_name, 0, sizeof(cmd_name));
   sscanf(Cmd, "%31s%n", cmd_name, &len);
   int i = 0;
   while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name))
@@ -70,11 +63,13 @@ void CmdsParse(const command_t Commands[], const char *Cmd)
   if (Commands[i].Name) {
     while (Cmd[len] == ' ')
       ++len;
-    Commands[i].Parse(Cmd + 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};
@@ -91,8 +86,8 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown)
   // First, dump all single commands, which are not a container for 
   // other commands
   if (markdown) {
-    printf("command|offline|description\n");
-    printf("-------|-------|-----------\n");
+    printf("|%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
+    printf("|%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");
   } else {
     printf("%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
     printf("%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");
@@ -105,7 +100,7 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown)
 
     if ( cmds[i].Offline) cmd_offline = "Y";
     if (markdown)
-      printf("|`%s%s`|%s|`%s`|\n", parent, cmds[i].Name,cmd_offline, cmds[i].Help);
+      printf("|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd-(int)strlen(parent)-2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
     else
       printf("%s%-*s|%-*s|%s\n", parent, w_cmd-(int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
     ++i;