From 2f324918b3f6611d885fe8bd0807e1ec48f51b4f Mon Sep 17 00:00:00 2001 From: Martijn Plak Date: Tue, 23 Jan 2024 08:36:53 +0100 Subject: [PATCH] readmem: fix entry of numbers and allow hexadecimal --- client/src/cmdhw.c | 6 +++--- client/src/proxmark3.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/cmdhw.c b/client/src/cmdhw.c index 572516639..e9f05ce30 100644 --- a/client/src/cmdhw.c +++ b/client/src/cmdhw.c @@ -640,10 +640,10 @@ static int CmdReadmem(const char *Cmd) { void *argtable[] = { arg_param_begin, - arg_int0("a", "adr", "", "flash address to start reading from"), - arg_int0("l", "len", "", "length (default 32 or 512KB)"), + arg_u64_0("a", "adr", "", "flash address to start reading from"), + arg_u64_0("l", "len", "", "length (default 32 or 512KB)"), arg_str0("f", "file", "", "save to file"), - arg_int0("c", "cols", "", "column breaks"), + arg_u64_0("c", "cols", "", "column breaks"), arg_lit0("r", "raw", "use raw address mode: read from anywhere, not just flash"), arg_param_end }; diff --git a/client/src/proxmark3.c b/client/src/proxmark3.c index a6cfe1dd7..024258819 100644 --- a/client/src/proxmark3.c +++ b/client/src/proxmark3.c @@ -1139,7 +1139,7 @@ int main(int argc, char *argv[]) { show_help(false, exec_name); return 1; } - uint32_t tmpaddr = strtol(argv[i + 1], NULL, 10); + uint32_t tmpaddr = strtoul(argv[i + 1], NULL, 0); dumpmem_addr = tmpaddr; i++; continue; @@ -1150,7 +1150,7 @@ int main(int argc, char *argv[]) { show_help(false, exec_name); return 1; } - uint32_t tmplen = strtol(argv[i + 1], NULL, 10); + uint32_t tmplen = strtoul(argv[i + 1], NULL, 0); dumpmem_len = tmplen; i++; continue;