ADD: @piwi's fixes to .history

[proxmark3-svn] / client / cmdparser.c

diff --git a/client/cmdparser.c b/client/cmdparser.c
index 0f97d7feede67730d0b7ea4813972de0fdbc0ed9..e67bdfe54fdaedf28b5cb15d32ff2e08a91b0b21 100644 (file)
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -9,9 +9,11 @@
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "ui.h"
 #include "cmdparser.h"
+#include "proxmark3.h"
 
 void CmdsHelp(const command_t Commands[])
 {
@@ -21,13 +23,35 @@ void CmdsHelp(const command_t Commands[])
   while (Commands[i].Name)
   {
     if (!offline || Commands[i].Offline)
-      PrintAndLog("%-16s %s", Commands[i].Name, Commands[i].Help);
+       PrintAndLog("%-16s %s", Commands[i].Name, Commands[i].Help);
     ++i;
   }
 }
 
-void CmdsParse(const command_t Commands[], const char *Cmd)
+void CmdsLS(const command_t Commands[])
 {
+  if (Commands[0].Name == NULL) return;
+  int i = 0;
+  while (Commands[i].Name)
+  {
+    if (!offline || Commands[i].Offline)
+       PrintAndLog("%-16s", Commands[i].Name);
+    ++i;
+  }
+}
+
+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 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);
@@ -50,9 +74,73 @@ void CmdsParse(const command_t Commands[], const char *Cmd)
     if(matches == 1) i=last_match;
   }
 
-  if (Commands[i].Name)
-    Commands[i].Parse(Cmd + len);
-  else
-    // show help (always first in array) for selected hierarchy or if command not recognised
+  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};
+char *parent = pparent;
+
+void dumpCommandsRecursive(const command_t cmds[], int markdown)
+{
+  if (cmds[0].Name == NULL)
+    return;
+
+  int i = 0;
+  int w_cmd=25;
+  int w_off=8;
+  // First, dump all single commands, which are not a container for 
+  // other commands
+  if (markdown) {
+    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,"-------","-----------");
+  }
+
+  while (cmds[i].Name)
+  {
+    char* cmd_offline = "N";
+    if(cmds[i].Help[0] == '{' && ++i) continue;
+
+    if ( cmds[i].Offline) cmd_offline = "Y";
+    if (markdown)
+      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;
+  }
+  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\n\n %s\n\n", 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;
+    // This is what causes the recursion, since commands Parse-implementation
+    // in turn calls the CmdsParse above. 
+    if (markdown)
+      cmds[i].Parse("XX_internal_command_dump_markdown_XX");
+    else
+      cmds[i].Parse("XX_internal_command_dump_XX");
+    parent = old_parent;
+    ++i;
+  }
+
 }