Fix some printf/scanf format strings

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index 8faed6e86cae50f34849dcd4b53b8337cfb03528..5c9d7424a614189ef5347b2acc8db6600bb4732e 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -16,14 +16,14 @@
 #include <stdarg.h>
 #include <readline/readline.h>
 #include <pthread.h>
+#include "util.h"
 #endif
 
 #include "ui.h"
 
 double CursorScaleFactor = 1;
 int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
-int offline;
-int flushAfterWrite = 0;  //buzzy
+bool flushAfterWrite = false;  //buzzy
 int GridOffset = 0;
 bool GridLocked = false;
 bool showDemod = true;
@@ -31,8 +31,78 @@ bool showDemod = true;
 static char *logfilename = "proxmark3.log";
 
 #ifndef EXTERNAL_PRINTANDLOG
-// Declared in proxmark3.c
-extern pthread_mutex_t print_lock;
+static pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
+
+void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
+
+       // skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0' 
+//     if (g_debugMode == 0 && level == DEBUG)
+//             return;
+       
+       char buffer[MAX_PRINT_BUFFER] = {0};
+       char buffer2[MAX_PRINT_BUFFER] = {0};
+       char prefix[20] = {0};
+       char *token = NULL;
+       int size = 0;
+                                               //   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
+       static char *prefixes[7] = { "", "", "INFO: ", "FAILED: ", "WARNING: ", "ERROR: ", "#: "};
+       
+       switch( level ) {
+               case FAILED:
+                       strncpy(prefix,_RED_(FAILED: ), sizeof(prefix)-1);
+                       break;
+               case DEBUG:
+                       strncpy(prefix,_BLUE_(#: ), sizeof(prefix)-1);                  
+                       break;
+               case SUCCESS: 
+                       strncpy(prefix,_GREEN_( ), sizeof(prefix)-1);
+                       break;
+               case WARNING:
+                       strncpy(prefix,_CYAN_(WARNING: ), sizeof(prefix)-1);
+                       break;          
+               default:
+                       strncpy(prefix, prefixes[level], sizeof(prefix)-1);
+                       break;
+       }
+       
+       va_list args;
+       va_start(args, fmt);
+       vsnprintf(buffer, sizeof(buffer), fmt, args);
+       va_end(args);
+
+       // no prefixes for normal
+       if ( level == NORMAL ) {
+               PrintAndLog(buffer);
+               return;
+       }
+       
+       if (strchr(buffer, '\n')) {
+
+               const char delim[2] = "\n";
+                       
+               // line starts with newline
+               if (buffer[0] == '\n') 
+                       PrintAndLog("");
+               
+               token = strtok(buffer, delim);
+               
+               while (token != NULL) {
+                       
+                       size = strlen(buffer2);
+               
+                       if (strlen(token))
+                               snprintf(buffer2+size, sizeof(buffer2)-size, "%s%s\n", prefix, token);
+                       else
+                               snprintf(buffer2+size, sizeof(buffer2)-size, "\n");
+                       
+                       token = strtok(NULL, delim);
+               }
+               PrintAndLog(buffer2);
+       } else {
+               snprintf(buffer2, sizeof(buffer2), "%s%.*s", prefix, MAX_PRINT_BUFFER - 20, buffer);
+               PrintAndLog(buffer2);
+       }
+}
 
 void PrintAndLog(char *fmt, ...)
 {
@@ -53,8 +123,11 @@ void PrintAndLog(char *fmt, ...)
                }
        }
 
+       // If there is an incoming message from the hardware (eg: lf hid read) in
+       // the background (while the prompt is displayed and accepting user input),
+       // stash the prompt and bring it back later.
 #ifdef RL_STATE_READCMD
-       // We are using GNU readline.
+       // We are using GNU readline. libedit (OSX) doesn't support this flag.
        int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
 
        if (need_hack) {
@@ -64,9 +137,6 @@ void PrintAndLog(char *fmt, ...)
                rl_replace_line("", 0);
                rl_redisplay();
        }
-#else
-       // We are using libedit (OSX), which doesn't support this flag.
-       int need_hack = 0;
 #endif
        
        va_start(argptr, fmt);
@@ -76,6 +146,8 @@ void PrintAndLog(char *fmt, ...)
        va_end(argptr);
        printf("\n");
 
+#ifdef RL_STATE_READCMD
+       // We are using GNU readline. libedit (OSX) doesn't support this flag.
        if (need_hack) {
                rl_restore_prompt();
                rl_replace_line(saved_line, 0);
@@ -83,6 +155,7 @@ void PrintAndLog(char *fmt, ...)
                rl_redisplay();
                free(saved_line);
        }
+#endif
        
        if (logging && logfile) {
                vfprintf(logfile, fmt, argptr2);
@@ -91,7 +164,7 @@ void PrintAndLog(char *fmt, ...)
        }
        va_end(argptr2);
 
-       if (flushAfterWrite == 1)  //buzzy
+       if (flushAfterWrite)  //buzzy
        {
                fflush(NULL);
        }
@@ -104,3 +177,8 @@ void SetLogFilename(char *fn)
 {
   logfilename = fn;
 }
+
+void SetFlushAfterWrite(bool flush_after_write) {
+       flushAfterWrite = flush_after_write;
+}
+