X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/19e2a10de5cdf7f6f366e5f43f0cacc662ff800a..7dcd37fc2e4b0deeda46c22b1604b1e089dff43e:/client/cmdparser.c?ds=sidebyside diff --git a/client/cmdparser.c b/client/cmdparser.c index 6910e86a..5d0363ac 100644 --- a/client/cmdparser.c +++ b/client/cmdparser.c @@ -15,34 +15,32 @@ #include "cmdparser.h" #include "proxmark3.h" -void CmdsHelp(const command_t Commands[]) -{ - if (Commands[0].Name == NULL) - return; - int i = 0; - while (Commands[i].Name) - { - if (!offline || Commands[i].Offline) - PrintAndLog("%-16s %s", Commands[i].Name, Commands[i].Help); - ++i; - } +void CmdsHelp(const command_t Commands[]) { + if (Commands[0].Name == NULL) return; + int i = 0; + while (Commands[i].Name) { + if (!offline || Commands[i].Offline) + PrintAndLog("%-16s %s", Commands[i].Name, Commands[i].Help); + ++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; + dumpCommandsRecursive(Commands, 0); + return 0; } if(strcmp( Cmd, "XX_internal_command_dump_markdown_XX") == 0) {// Markdown help dump children - dumpCommandsRecursive(Commands, 1); - return; + dumpCommandsRecursive(Commands, 1); + return 0; } char cmd_name[32]; int len = 0; - memset(cmd_name, 0, 32); + memset(cmd_name, 0, sizeof(cmd_name)); sscanf(Cmd, "%31s%n", cmd_name, &len); int i = 0; while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name)) @@ -65,11 +63,13 @@ void CmdsParse(const command_t Commands[], const char *Cmd) if (Commands[i].Name) { while (Cmd[len] == ' ') ++len; - Commands[i].Parse(Cmd + 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};