github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chg: printandlogex now deals with string which has inital newline char.

Browse source
This commit is contained in:
iceman1001 2018-04-27 11:22:30 +02:00
commit c41013d394
12 changed files with 53 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/cmdmain.c
View file

@ -208,7 +208,7 @@ void UsbCommandReceived(UsbCommand* _ch) {
char s[USB_CMD_DATA_SIZE+1];
memset(s, 0x00, sizeof(s));
size_t len = MIN(c->arg[0],USB_CMD_DATA_SIZE);
size_t len = MIN(c->arg[0], USB_CMD_DATA_SIZE);
memcpy(s, c->d.asBytes, len);
// print debug line on same row. escape seq \r
@ -233,11 +233,10 @@ void UsbCommandReceived(UsbCommand* _ch) {
// arg1 = length bytes to transfer
// arg2 = bigbuff tracelength (?)
uint32_t offset = c->arg[0];
uint32_t len = c->arg[1];
uint32_t len = MIN(c->arg[1], sample_buf_size);
//uint32_t tracelen = c->arg[2];
// extra bounds check.
len = MIN(sample_buf_size, len);
printf("SAMPLE_BUF_SIZE %u | adjusted len %u \n", sample_buf_size, len);
memcpy( sample_buf + offset, c->d.asBytes, len);
//PrintAndLogEx(NORMAL, "ICE:: Download from device. chunk %" PRIu32 " | size %" PRIu32 " | tracelen:%" PRIu32 " \n", offset, len, c->arg[2]);