Merge pull request #638 from grauerfuchs/master

[proxmark3-svn] / client / cmdparser.c

diff --git a/client/cmdparser.c b/client/cmdparser.c
index 0f97d7feede67730d0b7ea4813972de0fdbc0ed9..34230d52afa897d2eb0629120ac279894209dc6f 100644 (file)
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -8,10 +8,15 @@
 // Command parser
 //-----------------------------------------------------------------------------
 
 // Command parser
 //-----------------------------------------------------------------------------
 

+#include "cmdparser.h"
+

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>

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

-#include "cmdparser.h"
+#include "proxmark3.h"
+#include "comms.h"
+

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


@@ -20,39 +25,114 @@ void CmdsHelp(const command_t Commands[])
   int i = 0;
   while (Commands[i].Name)
   {
   int i = 0;
   while (Commands[i].Name)
   {

-    if (!offline || Commands[i].Offline)
-      PrintAndLog("%-16s %s", Commands[i].Name, Commands[i].Help);
+    if (!IsOffline() || Commands[i].Offline)
+       PrintAndLog("%-16s %s", Commands[i].Name, Commands[i].Help);

     ++i;
   }
 }
 
     ++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 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;
+       }
+
+       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)

 {
 {

-  char cmd_name[32];
-  int len = 0;
-  memset(cmd_name, 0, 32);
-  sscanf(Cmd, "%31s%n", cmd_name, &len);
+  if (cmds[0].Name == NULL)
+    return;
+

   int i = 0;
   int i = 0;

-  while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name))
+  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;
     ++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);

 
 

-  /* 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;
+    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;

   }
 
   }
 

-  if (Commands[i].Name)
-    Commands[i].Parse(Cmd + len);
-  else
-    // show help (always first in array) for selected hierarchy or if command not recognised
-    CmdsHelp(Commands);

 }
 }