Merge branch 'master' into master

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index 48869fd1049f2914f01c636b5d28280f1cf35f8b..50a6ec7d0256a2003f2d8f7e6bad0174a252516c 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,27 +9,29 @@
 // UI utilities
 //-----------------------------------------------------------------------------
 
-#include <stdarg.h>
+#include <stdbool.h>
+#ifndef EXTERNAL_PRINTANDLOG
 #include <stdlib.h>
 #include <stdio.h>
-#include <stdbool.h>
+#include <stdarg.h>
 #include <readline/readline.h>
 #include <pthread.h>
+#endif
 
 #include "ui.h"
 
 double CursorScaleFactor = 1;
 int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
-int offline;
 bool flushAfterWrite = false;  //buzzy
 int GridOffset = 0;
 bool GridLocked = false;
 bool showDemod = true;
 
-extern pthread_mutex_t print_lock;
-
 static char *logfilename = "proxmark3.log";
 
+#ifndef EXTERNAL_PRINTANDLOG
+static pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
+
 void PrintAndLog(char *fmt, ...)
 {
        char *saved_line;
@@ -49,8 +51,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) {
@@ -60,8 +65,6 @@ void PrintAndLog(char *fmt, ...)
                rl_replace_line("", 0);
                rl_redisplay();
        }
-#else
-       // We are using libedit (OSX), which doesn't support this flag.
 #endif
        
        va_start(argptr, fmt);
@@ -71,9 +74,8 @@ void PrintAndLog(char *fmt, ...)
        va_end(argptr);
        printf("\n");
 
-       // This needs to be wrapped in ifdefs, as this if optimisation is disabled,
-       // this block won't be removed, and it'll fail at the linker.
 #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);
@@ -90,14 +92,14 @@ void PrintAndLog(char *fmt, ...)
        }
        va_end(argptr2);
 
-       if (flushAfterWrite == 1)  //buzzy
+       if (flushAfterWrite)  //buzzy
        {
                fflush(NULL);
        }
        //release lock
        pthread_mutex_unlock(&print_lock);  
 }
-
+#endif
 
 void SetLogFilename(char *fn)
 {