From 07632393630729d2e3bd0a3d36cdb401b934d88a Mon Sep 17 00:00:00 2001
From: Michael Farrell <micolous+git@gmail.com>
Date: Sat, 17 Mar 2018 18:19:52 +1100
Subject: [PATCH] OSX: Multiple libedit/readline fixes.

---
 client/proxmark3.c |  5 ++++-
 client/ui.c        | 11 +++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 95dd7cb9..e5a42262 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -132,7 +132,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
 			printf("executing commands from file: %s\n", script_cmds_file);
 		}
 	}
-	
+
 	read_history(".history");
 
 	while(1)  {
@@ -287,6 +287,9 @@ int main(int argc, char* argv[]) {
 	bool addLuaExec = false;
 	char *script_cmds_file = NULL;
 	char *script_cmd = NULL;
+
+	// Must be before the first PrintAndLog call, for rl_redisplay
+	rl_initialize();
   
 	if (argc < 2) {
 		show_help(true, argv[0]);
diff --git a/client/ui.c b/client/ui.c
index 8faed6e8..dc122d2f 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -53,8 +53,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 +67,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 +76,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 +85,7 @@ void PrintAndLog(char *fmt, ...)
 		rl_redisplay();
 		free(saved_line);
 	}
+#endif
 	
 	if (logging && logfile) {
 		vfprintf(logfile, fmt, argptr2);