X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/fcdfc43e1ff49b58d2a0b85d5f4beee634906ca6..feb1bf41848aa8e618d4926aa4beef885fd7b32d:/client/cmdparser.c diff --git a/client/cmdparser.c b/client/cmdparser.c index 1afeb930..32508997 100644 --- a/client/cmdparser.c +++ b/client/cmdparser.c @@ -9,9 +9,12 @@ //----------------------------------------------------------------------------- #include +#include #include #include "ui.h" #include "cmdparser.h" +#include "proxmark3.h" + void CmdsHelp(const command_t Commands[]) { @@ -21,43 +24,113 @@ 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[], 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; - while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name)) - ++i; + 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,"-------","-----------"); + } - /* 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; + 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 - if (Commands[i].Name) { - while (Cmd[len] == ' ') - ++len; - while (Cmd[strlen(Cmd) - 1] == ' ') - Cmd[strlen(Cmd) - 1] = '\0'; - Commands[i].Parse(Cmd + len); - } else { - // show help for selected hierarchy or if command not recognised - CmdsHelp(Commands); + 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; } + }