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

fancy INPLACE

Browse Source
This commit is contained in:
Philippe Teuwen
2019-05-14 12:35:25 +02:00
parent 48c71aeef6
commit 62cf4ad8a7
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
client/ui.c
View File

@@ -52,6 +52,9 @@ void PrintAndLogOptions(const char *str[][2], size_t size, size_t space) {
} }
PrintAndLogEx(NORMAL, "%s", buff); PrintAndLogEx(NORMAL, "%s", buff);
} }
uint8_t PrintAndLogEx_spinidx = 0;
void PrintAndLogEx(logLevel_t level, const char *fmt, ...) { void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
// skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0' // skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0'
@@ -64,7 +67,7 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
char *token = NULL; char *token = NULL;
char *tmp_ptr = NULL; char *tmp_ptr = NULL;
FILE *stream = stdout; FILE *stream = stdout;
char *spinner[] = {_YELLOW_("[\\]"), _YELLOW_("[|]"), _YELLOW_("[/]"), _YELLOW_("[-]")};
switch (level) { switch (level) {
case ERR: case ERR:
strncpy(prefix, _RED_("[!!]"), sizeof(prefix) - 1); strncpy(prefix, _RED_("[!!]"), sizeof(prefix) - 1);
@@ -85,9 +88,14 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
case INFO: case INFO:
strncpy(prefix, _YELLOW_("[=]"), sizeof(prefix) - 1); strncpy(prefix, _YELLOW_("[=]"), sizeof(prefix) - 1);
break; break;
case NORMAL:
case INPLACE: case INPLACE:
// no prefixes for normal & inplace strncpy(prefix, spinner[PrintAndLogEx_spinidx], sizeof(prefix) - 1);
PrintAndLogEx_spinidx++;
if (PrintAndLogEx_spinidx == ARRAYLEN(spinner))
PrintAndLogEx_spinidx = 0;
break;
case NORMAL:
// no prefixes for normal
break; break;
} }
@@ -101,11 +109,6 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
fPrintAndLog(stream, "%s", buffer); fPrintAndLog(stream, "%s", buffer);
return; return;
} }
if (level == INPLACE) {
printf("\r[*] %s", buffer);
fflush(stdout);
return;
}
if (strchr(buffer, '\n')) { if (strchr(buffer, '\n')) {
@@ -131,7 +134,12 @@ void PrintAndLogEx(logLevel_t level, const char *fmt, ...) {
fPrintAndLog(stream, "%s", buffer2); fPrintAndLog(stream, "%s", buffer2);
} else { } else {
snprintf(buffer2, sizeof(buffer2), "%s%s", prefix, buffer); snprintf(buffer2, sizeof(buffer2), "%s%s", prefix, buffer);
fPrintAndLog(stream, "%s", buffer2); if (level == INPLACE) {
fprintf(stream, "\r%s", buffer2);
fflush(stream);
} else {
fPrintAndLog(stream, "%s", buffer2);
}
} }
} }