X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/dec8e8bd9f67643c07af9b06f9d6e9e1a2fb9191..7838f4beba79370f94c7a3de2cf34278f5d481c8:/client/cmdparser.c diff --git a/client/cmdparser.c b/client/cmdparser.c index 3820de17..ae67466a 100644 --- a/client/cmdparser.c +++ b/client/cmdparser.c @@ -22,13 +22,20 @@ 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 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; } } @@ -91,8 +98,8 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) // First, dump all single commands, which are not a container for // other commands if (markdown) { - printf("command|offline|description\n"); - printf("-------|-------|-----------\n"); + 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,"-------","-----------"); @@ -105,7 +112,7 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) if ( cmds[i].Offline) cmd_offline = "Y"; if (markdown) - printf("|`%s%s`|%s|`%s`|\n", parent, cmds[i].Name,cmd_offline, cmds[i].Help); + 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;