]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
OSX: Disable GNU readline-specific hack when libedit is used (fixes #110)
authorMichael Farrell <micolous+git@gmail.com>
Sun, 25 Jun 2017 02:26:33 +0000 (12:26 +1000)
committerMichael Farrell <micolous+git@gmail.com>
Sun, 25 Jun 2017 02:26:33 +0000 (12:26 +1000)
client/ui.c

index 05e29dc70d927e48264f049fa41164c06c2dd32c..df2c3ce3c6a6909cb99317f34770853c40992f13 100644 (file)
@@ -48,7 +48,9 @@ void PrintAndLog(char *fmt, ...)
                        logging=0;
                }
        }
                        logging=0;
                }
        }
-       
+
+#ifdef RL_STATE_READCMD
+       // We are using GNU readline.
        int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
 
        if (need_hack) {
        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();
        }
                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);
        
        va_start(argptr, fmt);
        va_copy(argptr2, argptr);
Impressum, Datenschutz