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

Rework hf tune to make it synchronous (needed for rdv4)

Browse source
This commit is contained in:
Philippe Teuwen 2019-05-14 00:36:58 +02:00
commit 7ed7a9de40
5 changed files with 74 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/ui.c
View file

@ -63,8 +63,6 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
char buffer2[MAX_PRINT_BUFFER + 20] = {0};
char *token = NULL;
char *tmp_ptr = NULL;
// {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
static const char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
FILE *stream = stdout;
switch (level) {
@ -88,7 +86,8 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
strncpy(prefix, _YELLOW_("[=]"), sizeof(prefix) - 1);
break;
case NORMAL:
strncpy(prefix, prefixes[level], sizeof(prefix) - 1);
case INPLACE:
// no prefixes for normal & inplace
break;
}
@ -97,11 +96,16 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
vsnprintf(buffer, sizeof(buffer), fmt, args);
va_end(args);
// no prefixes for normal
// no prefixes for normal & inplace
if (level == NORMAL) {
fPrintAndLog(stream, "%s", buffer);
return;
}
if (level == INPLACE) {
printf("%s\r", buffer);
fflush(stdout);
return;
}
if (strchr(buffer, '\n')) {