X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b5727175c08599f0f483edbfcfc534ff7f050d77..b2f565142ce739ff94a6f4c55d63a81ffed56759:/client/cmdparser.c?ds=inline

diff --git a/client/cmdparser.c b/client/cmdparser.c
index 7c3c60cc..32508997 100644
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -15,6 +15,7 @@
 #include "cmdparser.h"
 #include "proxmark3.h"
 
+
 void CmdsHelp(const command_t Commands[])
 {
   if (Commands[0].Name == NULL)
@@ -22,81 +23,90 @@ void CmdsHelp(const command_t Commands[])
   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);
-      }
+    if (!offline || Commands[i].Offline)
+       PrintAndLog("%-16s %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);
-  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;
-    Commands[i].Parse(Cmd + len);
-  } else {
-    // show help for selected hierarchy or if command not recognised
-    CmdsHelp(Commands);
-  }
+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;
 }
-//static int tablevel = 0;
 
 char pparent[512] = {0};
 char *parent = pparent;
 
-void dumpCommandsRecursive(const command_t cmds[])
+void dumpCommandsRecursive(const command_t cmds[], int markdown)
 {
-   if (cmds[0].Name == NULL)
+  if (cmds[0].Name == NULL)
     return;
 
   int i = 0;
-  char* tabulation = "###";
+  int w_cmd=25;
+  int w_off=8;
   // First, dump all single commands, which are not a container for 
   // other commands
-  printf("command|offline|description\n");
-  printf("-------|-------|-----------\n");
+  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* offline = "N";
+    char* cmd_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);
+    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");
@@ -107,17 +117,18 @@ void dumpCommandsRecursive(const command_t cmds[])
   {
     if(cmds[i].Help[0] != '{' && ++i)  continue;
 
-    printf("%s %s%s\n\n %s\n\n", tabulation, parent, cmds[i].Name, cmds[i].Help);        
+    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;
-//    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--;
+    if (markdown)
+      cmds[i].Parse("XX_internal_command_dump_markdown_XX");
+    else
+      cmds[i].Parse("XX_internal_command_dump_XX");
     parent = old_parent;
     ++i;
   }