github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-23 14:35:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

added samples to command's help

Browse source
This commit is contained in:
merlokk 2017-11-28 14:40:15 +02:00
commit ae5355aefd
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/cliparser/cliparser.c
View file

@ -16,13 +16,15 @@ void **argtable = NULL;
size_t argtableLen = 0; size_t argtableLen = 0;
char *programName = NULL; char *programName = NULL;
char *programHint = NULL; char *programHint = NULL;
char *programHelp = NULL;
char buf[500] = {0}; char buf[500] = {0};
int CLIParserInit(char *vprogramName, char *vprogramHint) { int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp) {
argtable = NULL; argtable = NULL;
argtableLen = 0; argtableLen = 0;
programName = vprogramName; programName = vprogramName;
programHint = vprogramHint; programHint = vprogramHint;
programHelp = vprogramHelp;
memset(buf, 0x00, 500); memset(buf, 0x00, 500);
return 0; return 0;
@ -49,8 +51,10 @@ int CLIParserParseArg(int argc, char **argv, void* vargtable[], size_t vargtable
arg_print_syntaxv(stdout, argtable, "\n"); arg_print_syntaxv(stdout, argtable, "\n");
if (programHint) if (programHint)
printf("%s\n\n", programHint); printf("%s\n\n", programHint);
arg_print_glossary(stdout, argtable, " %-19s %s\n"); arg_print_glossary(stdout, argtable, " %-20s %s\n");
printf("\n"); printf("\n");
if (programHelp)
printf("%s \n", programHelp);
return 1; return 1;
} }

2
client/cliparser/cliparser.h
View file

@ -19,7 +19,7 @@
#define arg_get_str(n)(((struct arg_str*)argtable[n])) #define arg_get_str(n)(((struct arg_str*)argtable[n]))
#define arg_get_int(n)(((struct arg_int*)argtable[n])) #define arg_get_int(n)(((struct arg_int*)argtable[n]))
extern int CLIParserInit(char *vprogramName, char *vprogramHint); extern int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp);
extern int CLIParserParseString(const char* str, void* argtable[], size_t vargtableLen, bool allowEmptyExec); extern int CLIParserParseString(const char* str, void* argtable[], size_t vargtableLen, bool allowEmptyExec);
extern int CLIParserParseArg(int argc, char **argv, void* argtable[], size_t vargtableLen, bool allowEmptyExec); extern int CLIParserParseArg(int argc, char **argv, void* argtable[], size_t vargtableLen, bool allowEmptyExec);
extern void CLIParserFree(); extern void CLIParserFree();

18
client/cmdhf14a.c
View file

@ -135,7 +135,7 @@ int CmdHF14AReader(const char *Cmd) {
uint32_t cm = ISO14A_CONNECT; uint32_t cm = ISO14A_CONNECT;
bool leaveSignalON = false; bool leaveSignalON = false;
CLIParserInit("hf 14a reader", "Executes ISO1443A anticollision-select group of commands."); CLIParserInit("hf 14a reader", "Executes ISO1443A anticollision-select group of commands.", NULL);
void* argtable[] = { void* argtable[] = {
arg_param_begin, arg_param_begin,
arg_lit0("kK", "keep", "keep the field active after command executed"), arg_lit0("kK", "keep", "keep the field active after command executed"),
@ -721,15 +721,8 @@ int CmdHF14AAPDU(const char *cmd) {
bool leaveSignalON = false; bool leaveSignalON = false;
bool decodeTLV = false; bool decodeTLV = false;
CLIParserInit("hf 14a apdu", "Send ISO 14443-4 APDU to tag"); CLIParserInit("hf 14a apdu", "Send ISO 14443-4 APDU to tag", "Sample:\n\thf 14a apdu -st 00A404000E325041592E5359532E444446303100\n");
/*struct arg_lit *ahelp = arg_lit0("hH", "help", "print this help and exit");
struct arg_lit *as = arg_lit0("sS", "select", "activate field and select card");
struct arg_lit *ak = arg_lit0("kK", "keep", "leave the signal field ON after receive response");
struct arg_lit *at = arg_lit0("tT", "tlv", "executes TLV decoder if it possible");
struct arg_str *astr = arg_str1(NULL, NULL, "<APDU (hex)>", NULL);
struct arg_end *aend = arg_end(20);
void* argtable[] = {ahelp, as, ak, at, astr, aend};
*/
void* argtable[] = { void* argtable[] = {
arg_param_begin, arg_param_begin,
arg_lit0("sS", "select", "activate field and select card"), arg_lit0("sS", "select", "activate field and select card"),
@ -790,7 +783,10 @@ int CmdHF14ACmdRaw(const char *cmd) {
int datalen = 0; int datalen = 0;
// extract parameters // extract parameters
CLIParserInit("hf 14a raw", "Send raw hex data to tag"); CLIParserInit("hf 14a raw", "Send raw hex data to tag",
"Sample:\n"\
"\thf 14a raw -pa -b7 -t1000 52 -- execute WUPA\n"\
"\thf 14a raw -p 9320 -- anticollision\n");
void* argtable[] = { void* argtable[] = {
arg_param_begin, arg_param_begin,
arg_lit0("rR", "nreply", "do not read response"), arg_lit0("rR", "nreply", "do not read response"),