Comms refactor (prerequisite of libproxmark work) (#371)

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index df2c3ce3c6a6909cb99317f34770853c40992f13..48869fd1049f2914f01c636b5d28280f1cf35f8b 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -21,7 +21,7 @@
 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;
@@ -62,7 +62,6 @@ void PrintAndLog(char *fmt, ...)
        }
 #else
        // We are using libedit (OSX), which doesn't support this flag.
-       int need_hack = 0;
 #endif
        
        va_start(argptr, fmt);
@@ -72,6 +71,9 @@ 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
        if (need_hack) {
                rl_restore_prompt();
                rl_replace_line(saved_line, 0);
@@ -79,6 +81,7 @@ void PrintAndLog(char *fmt, ...)
                rl_redisplay();
                free(saved_line);
        }
+#endif
        
        if (logging && logfile) {
                vfprintf(logfile, fmt, argptr2);
@@ -100,3 +103,8 @@ void SetLogFilename(char *fn)
 {
   logfilename = fn;
 }
+
+void SetFlushAfterWrite(bool flush_after_write) {
+       flushAfterWrite = flush_after_write;
+}
+