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

no printf, no sprintf

Browse source
This commit is contained in:
iceman1001 2020-08-29 15:35:16 +02:00
commit 30c0f85760
1 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

39
client/src/cmdhflegic.c
View file

@ -709,16 +709,17 @@ static int CmdLegicWrbl(const char *Cmd) {
char *answer = readline(confirm); char *answer = readline(confirm);
overwrite = (answer[0] == 'y' || answer[0] == 'Y'); overwrite = (answer[0] == 'y' || answer[0] == 'Y');
#else #else
printf("%s", confirm); PrintAndLogEx(NORMAL, "%s" NOLF, confirm);
char *answer = NULL; char *answer = NULL;
size_t anslen = 0; size_t anslen = 0;
if (getline(&answer, &anslen, stdin) > 0) { if (getline(&answer, &anslen, stdin) > 0) {
overwrite = (answer[0] == 'y' || answer[0] == 'Y'); overwrite = (answer[0] == 'y' || answer[0] == 'Y');
} }
PrintAndLogEx(NORMAL, "");
#endif #endif
free(answer); free(answer);
if (!overwrite) { if (overwrite == false) {
PrintAndLogEx(NORMAL, "command cancelled"); PrintAndLogEx(WARNING, "command cancelled");
return PM3_EOPABORTED; return PM3_EOPABORTED;
} }
} }
@ -731,18 +732,16 @@ static int CmdLegicWrbl(const char *Cmd) {
clearCommandBuffer(); clearCommandBuffer();
SendCommandOLD(CMD_HF_LEGIC_WRITER, offset, len, IV, data, len); SendCommandOLD(CMD_HF_LEGIC_WRITER, offset, len, IV, data, len);
uint8_t timeout = 0; uint8_t timeout = 0;
while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) { while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
++timeout; ++timeout;
printf("."); PrintAndLogEx(NORMAL, "." NOLF);
fflush(stdout);
if (timeout > 7) { if (timeout > 7) {
PrintAndLogEx(WARNING, "\ncommand execution time out"); PrintAndLogEx(WARNING, "\ncommand execution time out");
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
} }
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(NORMAL, "");
uint8_t isOK = resp.oldarg[0] & 0xFF; uint8_t isOK = resp.oldarg[0] & 0xFF;
if (!isOK) { if (!isOK) {
@ -846,8 +845,7 @@ int legic_read_mem(uint32_t offset, uint32_t len, uint32_t iv, uint8_t *out, uin
uint8_t timeout = 0; uint8_t timeout = 0;
while (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { while (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
++timeout; ++timeout;
printf("."); PrintAndLogEx(NORMAL, "." NOLF);
fflush(stdout);
if (timeout > 14) { if (timeout > 14) {
PrintAndLogEx(WARNING, "\ncommand execution time out"); PrintAndLogEx(WARNING, "\ncommand execution time out");
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
@ -990,14 +988,13 @@ static int CmdLegicDump(const char *Cmd) {
uint8_t timeout = 0; uint8_t timeout = 0;
while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) { while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
++timeout; ++timeout;
printf("."); PrintAndLogEx(NORMAL, "." NOLF);
fflush(stdout);
if (timeout > 7) { if (timeout > 7) {
PrintAndLogEx(WARNING, "\ncommand execution time out"); PrintAndLogEx(WARNING, "\ncommand execution time out");
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
} }
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(NORMAL, "");
uint8_t isOK = resp.oldarg[0] & 0xFF; uint8_t isOK = resp.oldarg[0] & 0xFF;
if (!isOK) { if (!isOK) {
@ -1025,7 +1022,7 @@ static int CmdLegicDump(const char *Cmd) {
// user supplied filename? // user supplied filename?
if (fileNameLen < 1) { if (fileNameLen < 1) {
PrintAndLogEx(INFO, "Using UID as filename"); PrintAndLogEx(INFO, "Using UID as filename");
fptr += sprintf(fptr, "hf-legic-"); fptr += snprintf(fptr, sizeof(filename), "hf-legic-");
FillFileNameByUID(fptr, data, "-dump", 4); FillFileNameByUID(fptr, data, "-dump", 4);
} }
@ -1134,15 +1131,14 @@ static int CmdLegicRestore(const char *Cmd) {
uint8_t timeout = 0; uint8_t timeout = 0;
while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) { while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
++timeout; ++timeout;
printf("."); PrintAndLogEx(NORMAL, "." NOLF);
fflush(stdout);
if (timeout > 7) { if (timeout > 7) {
PrintAndLogEx(WARNING, "\ncommand execution time out"); PrintAndLogEx(WARNING, "\ncommand execution time out");
free(data); free(data);
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
} }
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(NORMAL, "");
uint8_t isOK = resp.oldarg[0] & 0xFF; uint8_t isOK = resp.oldarg[0] & 0xFF;
if (!isOK) { if (!isOK) {
@ -1300,7 +1296,7 @@ static int CmdLegicESave(const char *Cmd) {
// user supplied filename? // user supplied filename?
if (fileNameLen < 1) { if (fileNameLen < 1) {
PrintAndLogEx(INFO, "Using UID as filename"); PrintAndLogEx(INFO, "Using UID as filename");
fptr += sprintf(fptr, "hf-legic-"); fptr += snprintf(fptr, sizeof(filename), "hf-legic-");
FillFileNameByUID(fptr, data, "-dump", 4); FillFileNameByUID(fptr, data, "-dump", 4);
} }
@ -1344,8 +1340,8 @@ static int CmdLegicWipe(const char *Cmd) {
PacketResponseNG resp; PacketResponseNG resp;
for (size_t i = 7; i < card.cardsize; i += PM3_CMD_DATA_SIZE) { for (size_t i = 7; i < card.cardsize; i += PM3_CMD_DATA_SIZE) {
printf("."); PrintAndLogEx(NORMAL, "." NOLF);
fflush(stdout);
size_t len = MIN((card.cardsize - i), PM3_CMD_DATA_SIZE); size_t len = MIN((card.cardsize - i), PM3_CMD_DATA_SIZE);
if (len == card.cardsize - i) { if (len == card.cardsize - i) {
// Disable fast mode on last packet // Disable fast mode on last packet
@ -1357,15 +1353,14 @@ static int CmdLegicWipe(const char *Cmd) {
uint8_t timeout = 0; uint8_t timeout = 0;
while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) { while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
++timeout; ++timeout;
printf("."); PrintAndLogEx(NORMAL, "." NOLF);
fflush(stdout);
if (timeout > 7) { if (timeout > 7) {
PrintAndLogEx(WARNING, "\ncommand execution time out"); PrintAndLogEx(WARNING, "\ncommand execution time out");
free(data); free(data);
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
} }
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(NORMAL, "");
uint8_t isOK = resp.oldarg[0] & 0xFF; uint8_t isOK = resp.oldarg[0] & 0xFF;
if (!isOK) { if (!isOK) {