From: Michael Farrell <micolous+git@gmail.com>
Date: Sun, 25 Jun 2017 02:26:33 +0000 (+1000)
Subject: OSX: Disable GNU readline-specific hack when libedit is used (fixes #110)
X-Git-Tag: v3.1.0~199^2~2
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/ed50f7f327fab28320e52a8138979385b225709b

OSX: Disable GNU readline-specific hack when libedit is used (fixes #110)
---

diff --git a/client/ui.c b/client/ui.c
index 05e29dc7..df2c3ce3 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -48,7 +48,9 @@ void PrintAndLog(char *fmt, ...)
 			logging=0;
 		}
 	}
-	
+
+#ifdef RL_STATE_READCMD
+	// We are using GNU readline.
 	int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
 
 	if (need_hack) {
@@ -58,6 +60,10 @@ 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);
 	va_copy(argptr2, argptr);