From cc81b5bed9023a4ac93e6d45eab4584b13051150 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sat, 9 Mar 2019 12:31:29 +0100 Subject: [PATCH] fix: tolower --- client/cmddata.c | 8 ++++---- client/cmdhf.c | 8 ++++---- client/cmdhf15.c | 5 ++--- client/cmdhficlass.c | 8 ++++---- client/cmdlfem4x.c | 2 +- client/cmdlft55xx.c | 6 +++--- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/client/cmddata.c b/client/cmddata.c index 998ce3779..cdd26c27b 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -863,8 +863,8 @@ int CmdBitsamples(const char *Cmd) int CmdBuffClear(const char *Cmd) { - char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') return usage_data_buffclear(); + char cmdp = tolower(param_getchar(Cmd, 0)); + if (cmdp == 'h') return usage_data_buffclear(); UsbCommand c = {CMD_BUFF_CLEAR, {0,0,0}}; clearCommandBuffer(); @@ -891,8 +891,8 @@ int CmdDec(const char *Cmd) */ int CmdUndec(const char *Cmd) { - char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') return usage_data_undecimate(); + char cmdp = tolower(param_getchar(Cmd, 0)); + if (cmdp == 'h') return usage_data_undecimate(); uint8_t factor = param_get8ex(Cmd, 0, 2, 10); diff --git a/client/cmdhf.c b/client/cmdhf.c index af5aa4c2b..6931f5c14 100644 --- a/client/cmdhf.c +++ b/client/cmdhf.c @@ -38,8 +38,8 @@ int usage_hf_snoop(){ int CmdHFSearch(const char *Cmd){ - char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') return usage_hf_search(); + char cmdp = tolower(param_getchar(Cmd, 0)); + if (cmdp == 'h') return usage_hf_search(); int ans = CmdHF14AInfo("s"); if (ans > 0) { @@ -94,8 +94,8 @@ int CmdHFTune(const char *Cmd) { } int CmdHFSnoop(const char *Cmd) { - char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') return usage_hf_snoop(); + char cmdp = tolower(param_getchar(Cmd, 0)); + if (cmdp == 'h') return usage_hf_snoop(); int skippairs = param_get32ex(Cmd, 0, 0, 10); int skiptriggers = param_get32ex(Cmd, 1, 0, 10); diff --git a/client/cmdhf15.c b/client/cmdhf15.c index dc1a47f40..bdec7c339 100644 --- a/client/cmdhf15.c +++ b/client/cmdhf15.c @@ -476,14 +476,13 @@ int CmdHF15Demod(const char *Cmd) { // * Acquire Samples as Reader (enables carrier, sends inquiry) //helptext int CmdHF15Samples(const char *Cmd) { - char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') return usage_15_samples(); + char cmdp = tolower(param_getchar(Cmd, 0)); + if (cmdp == 'h') return usage_15_samples(); UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693, {0,0,0}}; clearCommandBuffer(); SendCommand(&c); - //download samples getSamples(0, false); return 0; } diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c index 21384d935..e21de76ab 100644 --- a/client/cmdhficlass.c +++ b/client/cmdhficlass.c @@ -277,8 +277,8 @@ int CmdHFiClassList(const char *Cmd) { } int CmdHFiClassSniff(const char *Cmd) { - char cmdp = param_getchar(Cmd, 0); - if (cmdp == 'h' || cmdp == 'H') return usage_hf_iclass_sniff(); + char cmdp = tolower(param_getchar(Cmd, 0)); + if (cmdp == 'h' ) return usage_hf_iclass_sniff(); UsbCommand c = {CMD_SNOOP_ICLASS}; SendCommand(&c); return 0; @@ -286,8 +286,8 @@ int CmdHFiClassSniff(const char *Cmd) { int CmdHFiClassSim(const char *Cmd) { - char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd)<1 || cmdp == 'H' || cmdp == 'h') return usage_hf_iclass_sim(); + char cmdp = tolower(param_getchar(Cmd, 0)); + if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_iclass_sim(); uint8_t simType = 0; uint8_t CSN[8] = {0, 0, 0, 0, 0, 0, 0, 0}; diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c index 843c63809..47a05b260 100644 --- a/client/cmdlfem4x.c +++ b/client/cmdlfem4x.c @@ -607,7 +607,7 @@ int CmdEM410xWatchnSpoof(const char *Cmd) { int CmdEM410xWrite(const char *Cmd) { char cmdp = tolower(param_getchar(Cmd, 0)); - if (cmdp == 'h') return usage_lf_em410x_write(); + if (cmdp == 0x00 || cmdp == 'h') return usage_lf_em410x_write(); uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value int card = 0xFF; // invalid card value diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 068fd2612..285eb75bb 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -1471,10 +1471,10 @@ int CmdResetRead(const char *Cmd) { int CmdT55xxWipe(const char *Cmd) { char writeData[20] = {0}; char *ptrData = writeData; - char cmdp = param_getchar(Cmd, 0); - if ( cmdp == 'h' || cmdp == 'H') return usage_t55xx_wipe(); + char cmdp = tolower(param_getchar(Cmd, 0)); + if ( cmdp == 'h') return usage_t55xx_wipe(); - bool Q5 = (cmdp == 'q' || cmdp == 'Q'); + bool Q5 = (cmdp == 'q'); // Try with the default password to reset block 0 // With a pwd should work even if pwd bit not set