X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5d5311a2233a70ef01f722a09c2778444f3365bf..ae7aa73dd529b84ad75c7a3c75461be1d7c18454:/client/cmdparser.c diff --git a/client/cmdparser.c b/client/cmdparser.c index 5a02b95e..48d044d5 100644 --- a/client/cmdparser.c +++ b/client/cmdparser.c @@ -1,7 +1,18 @@ +//----------------------------------------------------------------------------- +// Copyright (C) 2010 iZsh +// +// This code is licensed to you under the terms of the GNU GPL, version 2 or, +// at your option, any later version. See the LICENSE.txt file for the text of +// the license. +//----------------------------------------------------------------------------- +// Command parser +//----------------------------------------------------------------------------- + #include #include #include "ui.h" #include "cmdparser.h" +#include "proxmark3.h" void CmdsHelp(const command_t Commands[]) { @@ -10,8 +21,10 @@ void CmdsHelp(const command_t Commands[]) int i = 0; while (Commands[i].Name) { - if (!offline || Commands[i].Offline) + if (offline == 0 || Commands[i].Offline) PrintAndLog("%-16s %s", Commands[i].Name, Commands[i].Help); + if (offline == 2 && !Commands[i].Offline) + PrintAndLog("%-14s @ %s", Commands[i].Name, Commands[i].Help); ++i; } } @@ -32,17 +45,20 @@ void CmdsParse(const command_t Commands[], const char *Cmd) 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( !strncmp(Commands[i].Name, cmd_name, strlen(cmd_name)) ) { + last_match = i; + matches++; + } } if(matches == 1) i=last_match; } - if (Commands[i].Name) + if (Commands[i].Name) { + while (Cmd[len] == ' ') + ++len; Commands[i].Parse(Cmd + len); - else - // show help (always first in array) for selected hierarchy or if command not recognised + } else { + // show help for selected hierarchy or if command not recognised CmdsHelp(Commands); + } }