Fix offline column in help dump

[proxmark3-svn] / client / cmdparser.c

diff --git a/client/cmdparser.c b/client/cmdparser.c
index 6bb0416467fd6dbf5af760801f555ac40d2205b1..7c3c60cc39a72ca28f78d62e2a3fc6a1f0b537b6 100644 (file)
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -1,7 +1,19 @@
+//-----------------------------------------------------------------------------
+// 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 <stdlib.h>
 #include <string.h>
 #include "ui.h"
 #include "cmdparser.h"
+#include "proxmark3.h"
 
 void CmdsHelp(const command_t Commands[])
 {
@@ -10,14 +22,26 @@ void CmdsHelp(const command_t Commands[])
   int i = 0;
   while (Commands[i].Name)
   {
-    if (!offline || Commands[i].Offline)
-      PrintAndLog("%-16s %s", Commands[i].Name, Commands[i].Help);
+      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 CmdsParse(const command_t Commands[], const char *Cmd)
 {
+  if(strcmp( Cmd, "XX_internal_command_dump_XX") == 0)
+  {// Markdown dump children
+      dumpCommandsRecursive(Commands);
+      return;
+  }
+
+
   char cmd_name[32];
   int len = 0;
   memset(cmd_name, 0, 32);
@@ -40,9 +64,62 @@ void CmdsParse(const command_t Commands[], const char *Cmd)
     if(matches == 1) i=last_match;
   }
 
-  if (Commands[i].Name)
+  if (Commands[i].Name) {
+    while (Cmd[len] == ' ')
+      ++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);
+  }
+}
+//static int tablevel = 0;
+
+char pparent[512] = {0};
+char *parent = pparent;
+
+void dumpCommandsRecursive(const command_t cmds[])
+{
+   if (cmds[0].Name == NULL)
+    return;
+
+  int i = 0;
+  char* tabulation = "###";
+  // First, dump all single commands, which are not a container for 
+  // other commands
+  printf("command|offline|description\n");
+  printf("-------|-------|-----------\n");
+
+  while (cmds[i].Name)
+  {
+    char* offline = "N";
+    if(cmds[i].Help[0] == '{' && ++i) continue;
+
+    if ( cmds[i].Offline) offline = "Y";
+    printf("|`%s%s`|%s|`%s`|\n", parent, cmds[i].Name,offline, cmds[i].Help);
+    ++i;
+  }
+  printf("\n\n");
+  i=0;
+  // Then, print the categories. These will go into subsections with their own tables
+
+  while (cmds[i].Name)
+  {
+    if(cmds[i].Help[0] != '{' && ++i)  continue;
+
+    printf("%s %s%s\n\n %s\n\n", tabulation, parent, cmds[i].Name, cmds[i].Help);        
+
+    char currentparent[512] = {0};
+    snprintf(currentparent, sizeof currentparent, "%s%s ", parent, cmds[i].Name);
+    char *old_parent = parent;
+    parent = currentparent;
+//    tablevel++;
+    // This is what causes the recursion, since commands Parse-implementation
+    // in turn calls the CmdsParse above. 
+    cmds[i].Parse("XX_internal_command_dump_XX");
+//    tablevel--;
+    parent = old_parent;
+    ++i;
+  }
+
 }