dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADD: param_getlength , gets the string length of one parameter

Browse Source
This commit is contained in:
iceman1001
2017-07-26 18:17:20 +02:00
parent ca0174e89b
commit 86bbd8f563
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/util.c
View File

@@ -274,7 +274,7 @@ void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSiz
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// line - param line // line - param line
// bg, en - symbol numbers in param line of beginning an ending parameter // bg, en - symbol numbers in param line of beginning and ending parameter
// paramnum - param number (from 0) // paramnum - param number (from 0)
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
int param_getptr(const char *line, int *bg, int *en, int paramnum) int param_getptr(const char *line, int *bg, int *en, int paramnum)
@@ -306,6 +306,15 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
return 0; return 0;
} }
int param_getlength(const char *line, int paramnum)
{
int bg, en;
if (param_getptr(line, &bg, &en, paramnum)) return 0;
return en - bg + 1;
}
char param_getchar(const char *line, int paramnum) char param_getchar(const char *line, int paramnum)
{ {
int bg, en; int bg, en;

4
client/util.h
View File

@@ -71,9 +71,6 @@
# define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8))) # define BSWAP_16(x) ((( ((x) & 0xFF00 ) >> 8))| ( (((x) & 0x00FF) << 8)))
#endif #endif
// Boolean
#define TRUE 1
#define FALSE 0
#define EVEN 0 #define EVEN 0
#define ODD 1 #define ODD 1
@@ -130,6 +127,7 @@ extern void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest);
extern uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize); extern uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);
extern void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest); extern void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest);
extern int param_getlength(const char *line, int paramnum);
extern char param_getchar(const char *line, int paramnum); extern char param_getchar(const char *line, int paramnum);
extern int param_getptr(const char *line, int *bg, int *en, int paramnum); extern int param_getptr(const char *line, int *bg, int *en, int paramnum);
extern uint8_t param_get8(const char *line, int paramnum); extern uint8_t param_get8(const char *line, int paramnum);