From cc236f1bf6fb01db55cb36781f14bf5fbd97b061 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Mon, 22 Oct 2018 22:36:11 +0300
Subject: memview: fix some bugs in the input()

---
 src/memview.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/memview.c b/src/memview.c
index eb61106..0f07cba 100644
--- a/src/memview.c
+++ b/src/memview.c
@@ -478,22 +478,24 @@ input(const char *prompt)
 {
    static char input[255];
    memset(input, 0, sizeof(input));
-   for (unsigned char i = 0; (size_t)i + 1 < sizeof(input); i += input[i] != 0) {
+   for (unsigned char i = 0;;) {
       screen_cursor(0, ctx.term.ws.h);
       screen_print(ESCA CLEAR_LINE);
       screen_printf(FMT(FG YELLOW) "%s" FMT(PLAIN) " %s", prompt, input);
       screen_flush();
       fread(input + i, 1, 1, TERM_STREAM);
-
       switch (input[i]) {
          case 0x7f:
-            input[(i > 0 ? --i : 0)] = 0;
+            input[(i > 0 ? i-- : 0)] = 0;
             break;
          case 0x04:
          case 0x1b:
             return NULL;
          case '\n':
+            input[i] = 0;
             goto out;
+         default:
+            i += (i < sizeof(input) && (unsigned int)snprintf(NULL, 0, "%s %s", prompt, input) < ctx.term.ws.w);
       }
    }
 
-- 
cgit v1.2.3