OSX: Multiple libedit/readline fixes (#585)
authorMichael Farrell <micolous+gh@gmail.com>
Wed, 21 Mar 2018 15:05:03 +0000 (02:05 +1100)
committerpwpiwi <pwpiwi@users.noreply.github.com>
Wed, 21 Mar 2018 15:05:03 +0000 (16:05 +0100)
* OSX: Multiple libedit/readline fixes.

client/proxmark3.c
client/ui.c

index 95dd7cb948168a17ccbc841bd097ced81c763d70..1b64f68b2e7f12624dee586eb4246f3e1bd723d2 100644 (file)
@@ -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)  {
index 8faed6e86cae50f34849dcd4b53b8337cfb03528..dc122d2f17acc04cd405d093dc4bb540e83c7355 100644 (file)
@@ -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);
Impressum, Datenschutz