From f54d771cd3e0c0431c7cf1e21edaf7f5d6021151 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <ivan@espressif.com>
Date: Thu, 30 Apr 2020 16:51:02 +0200
Subject: [PATCH] linenoise: actively flush the output stream, in case it is
 buffered

---
 components/console/linenoise/linenoise.c | 31 ++++++++++++++++++------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/components/console/linenoise/linenoise.c b/components/console/linenoise/linenoise.c
index 04a75b307e..774a339de6 100644
--- a/components/console/linenoise/linenoise.c
+++ b/components/console/linenoise/linenoise.c
@@ -203,6 +203,13 @@ void linenoiseSetDumbMode(int set) {
     dumbmode = set;
 }
 
+static void flushWrite(void) {
+    if (__fbufsize(stdout) > 0) {
+        fflush(stdout);
+    }
+    fsync(fileno(stdout));
+}
+
 /* Use the ESC [6n escape sequence to query the horizontal cursor position
  * and return it. On error -1 is returned, on success the position of the
  * cursor. */
@@ -213,7 +220,7 @@ static int getCursorPosition(void) {
 
     /* Report cursor location */
     fprintf(stdout, "\x1b[6n");
-
+    flushWrite();
     /* Read the response: ESC [ rows ; cols R */
     while (i < sizeof(buf)-1) {
         if (fread(buf+i, 1, 1, stdin) != 1) break;
@@ -238,6 +245,7 @@ static int getColumns(void) {
 
     /* Go to right margin and get position. */
     if (fwrite("\x1b[999C", 1, 6, stdout) != 6) goto failed;
+    flushWrite();
     cols = getCursorPosition();
     if (cols == -1) goto failed;
 
@@ -248,6 +256,7 @@ static int getColumns(void) {
         if (fwrite(seq, 1, strlen(seq), stdout) == -1) {
             /* Can't recover... */
         }
+        flushWrite();
     }
     return cols;
 
@@ -258,12 +267,14 @@ failed:
 /* Clear the screen. Used to handle ctrl+l */
 void linenoiseClearScreen(void) {
     fprintf(stdout,"\x1b[H\x1b[2J");
+    flushWrite();
 }
 
 /* Beep, used for completion when there is nothing to complete or when all
  * the choices were already shown. */
 static void linenoiseBeep(void) {
     fprintf(stdout, "\x7");
+    flushWrite();
 }
 
 /* ============================== Completion ================================ */
@@ -468,6 +479,7 @@ static void refreshSingleLine(struct linenoiseState *l) {
     snprintf(seq,64,"\r\x1b[%dC", (int)(pos+plen));
     abAppend(&ab,seq,strlen(seq));
     if (fwrite(ab.b, ab.len, 1, stdout) == -1) {} /* Can't recover from write error. */
+    flushWrite();
     abFree(&ab);
 }
 
@@ -555,6 +567,7 @@ static void refreshMultiLine(struct linenoiseState *l) {
     l->oldpos = l->pos;
 
     if (fwrite(ab.b,ab.len,1,stdout) == -1) {} /* Can't recover from write error. */
+    flushWrite();
     abFree(&ab);
 }
 
@@ -581,6 +594,7 @@ int linenoiseEditInsert(struct linenoiseState *l, char c) {
                 /* Avoid a full update of the line in the
                  * trivial case. */
                 if (fwrite(&c,1,1,stdout) == -1) return -1;
+                flushWrite();
             } else {
                 refreshLine(l);
             }
@@ -726,6 +740,7 @@ static int linenoiseEdit(char *buf, size_t buflen, const char *prompt)
 
     int pos1 = getCursorPosition();
     if (fwrite(prompt,l.plen,1,stdout) == -1) return -1;
+    flushWrite();
     int pos2 = getCursorPosition();
     if (pos1 >= 0 && pos2 >= 0) {
         l.plen = pos2 - pos1;
@@ -881,9 +896,7 @@ static int linenoiseEdit(char *buf, size_t buflen, const char *prompt)
             linenoiseEditDeletePrevWord(&l);
             break;
         }
-        if (__fbufsize(stdout) > 0) {
-            fflush(stdout);
-        }
+        flushWrite();
     }
     return l.len;
 }
@@ -894,14 +907,16 @@ void linenoiseAllowEmpty(bool val) {
 
 int linenoiseProbe(void) {
     /* Switch to non-blocking mode */
-    int flags = fcntl(STDIN_FILENO, F_GETFL);
+    int stdin_fileno = fileno(stdin);
+    int flags = fcntl(stdin_fileno, F_GETFL);
     flags |= O_NONBLOCK;
-    int res = fcntl(STDIN_FILENO, F_SETFL, flags);
+    int res = fcntl(stdin_fileno, F_SETFL, flags);
     if (res != 0) {
         return -1;
     }
     /* Device status request */
     fprintf(stdout, "\x1b[5n");
+    flushWrite();
 
     /* Try to read response */
     int timeout_ms = 200;
@@ -915,7 +930,7 @@ int linenoiseProbe(void) {
     }
     /* Restore old mode */
     flags &= ~O_NONBLOCK;
-    res = fcntl(STDIN_FILENO, F_SETFL, flags);
+    res = fcntl(stdin_fileno, F_SETFL, flags);
     if (res != 0) {
         return -1;
     }
@@ -935,6 +950,7 @@ static int linenoiseRaw(char *buf, size_t buflen, const char *prompt) {
 
     count = linenoiseEdit(buf, buflen, prompt);
     fputc('\n', stdout);
+    flushWrite();
     return count;
 }
 
@@ -961,6 +977,7 @@ static int linenoiseDumb(char* buf, size_t buflen, const char* prompt) {
         fputc(c, stdout); /* echo */
     }
     fputc('\n', stdout);
+    flushWrite();
     return count;
 }