OSX: Multiple libedit/readline fixes (#585)

* OSX: Multiple libedit/readline fixes.

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 95dd7cb948168a17ccbc841bd097ced81c763d70..1b64f68b2e7f12624dee586eb4246f3e1bd723d2 100644 (file)
--- 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);
                }
        }
                        printf("executing commands from file: %s\n", script_cmds_file);
                }
        }

-       
+

        read_history(".history");
 
        while(1)  {
        read_history(".history");
 
        while(1)  {

diff --git a/client/ui.c b/client/ui.c
index 8faed6e86cae50f34849dcd4b53b8337cfb03528..dc122d2f17acc04cd405d093dc4bb540e83c7355 100644 (file)
--- 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
 #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) {
        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();
        }
                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);
 #endif
        
        va_start(argptr, fmt);


@@ -76,6 +76,8 @@ void PrintAndLog(char *fmt, ...)
        va_end(argptr);
        printf("\n");
 
        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);
        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);
        }
                rl_redisplay();
                free(saved_line);
        }

+#endif

        
        if (logging && logfile) {
                vfprintf(logfile, fmt, argptr2);
        
        if (logging && logfile) {
                vfprintf(logfile, fmt, argptr2);