command: Remove the cmd_tbl_t typedef

[oweals/u-boot.git] / common / cli_readline.c

diff --git a/common/cli_readline.c b/common/cli_readline.c
index 9a9fb35b712b09c8a9a416796c6df1ea27c7f1a0..1f1e28c6d85787983adb683379e3b4acbdb047c0 100644 (file)
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -5,13 +6,13 @@
  * Add to readline cmdline-editing by
  * (C) Copyright 2005
  * JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <bootretry.h>
 #include <cli.h>
+#include <command.h>
+#include <time.h>
 #include <watchdog.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -274,6 +275,10 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len,
 
                ichar = getcmd_getch();
 
+               /* ichar=0x0 when error occurs in U-Boot getc */
+               if (!ichar)
+                       continue;
+
                if ((ichar == '\n') || (ichar == '\r')) {
                        putc('\n');
                        break;
@@ -283,46 +288,82 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len,
                 * handle standard linux xterm esc sequences for arrow key, etc.
                 */
                if (esc_len != 0) {
+                       enum { ESC_REJECT, ESC_SAVE, ESC_CONVERTED } act = ESC_REJECT;
+
                        if (esc_len == 1) {
-                               if (ichar == '[') {
-                                       esc_save[esc_len] = ichar;
-                                       esc_len = 2;
-                               } else {
-                                       cread_add_str(esc_save, esc_len,
-                                                     insert, &num, &eol_num,
-                                                     buf, *len);
-                                       esc_len = 0;
+                               if (ichar == '[' || ichar == 'O')
+                                       act = ESC_SAVE;
+                       } else if (esc_len == 2) {
+                               switch (ichar) {
+                               case 'D':       /* <- key */
+                                       ichar = CTL_CH('b');
+                                       act = ESC_CONVERTED;
+                                       break;  /* pass off to ^B handler */
+                               case 'C':       /* -> key */
+                                       ichar = CTL_CH('f');
+                                       act = ESC_CONVERTED;
+                                       break;  /* pass off to ^F handler */
+                               case 'H':       /* Home key */
+                                       ichar = CTL_CH('a');
+                                       act = ESC_CONVERTED;
+                                       break;  /* pass off to ^A handler */
+                               case 'F':       /* End key */
+                                       ichar = CTL_CH('e');
+                                       act = ESC_CONVERTED;
+                                       break;  /* pass off to ^E handler */
+                               case 'A':       /* up arrow */
+                                       ichar = CTL_CH('p');
+                                       act = ESC_CONVERTED;
+                                       break;  /* pass off to ^P handler */
+                               case 'B':       /* down arrow */
+                                       ichar = CTL_CH('n');
+                                       act = ESC_CONVERTED;
+                                       break;  /* pass off to ^N handler */
+                               case '1':
+                               case '3':
+                               case '4':
+                               case '7':
+                               case '8':
+                                       if (esc_save[1] == '[') {
+                                               /* see if next character is ~ */
+                                               act = ESC_SAVE;
+                                       }
+                                       break;
+                               }
+                       } else if (esc_len == 3) {
+                               if (ichar == '~') {
+                                       switch (esc_save[2]) {
+                                       case '3':       /* Delete key */
+                                               ichar = CTL_CH('d');
+                                               act = ESC_CONVERTED;
+                                               break;  /* pass to ^D handler */
+                                       case '1':       /* Home key */
+                                       case '7':
+                                               ichar = CTL_CH('a');
+                                               act = ESC_CONVERTED;
+                                               break;  /* pass to ^A handler */
+                                       case '4':       /* End key */
+                                       case '8':
+                                               ichar = CTL_CH('e');
+                                               act = ESC_CONVERTED;
+                                               break;  /* pass to ^E handler */
+                                       }
                                }
-                               continue;
                        }
 
-                       switch (ichar) {
-                       case 'D':       /* <- key */
-                               ichar = CTL_CH('b');
-                               esc_len = 0;
-                               break;
-                       case 'C':       /* -> key */
-                               ichar = CTL_CH('f');
-                               esc_len = 0;
-                               break;  /* pass off to ^F handler */
-                       case 'H':       /* Home key */
-                               ichar = CTL_CH('a');
-                               esc_len = 0;
-                               break;  /* pass off to ^A handler */
-                       case 'A':       /* up arrow */
-                               ichar = CTL_CH('p');
-                               esc_len = 0;
-                               break;  /* pass off to ^P handler */
-                       case 'B':       /* down arrow */
-                               ichar = CTL_CH('n');
-                               esc_len = 0;
-                               break;  /* pass off to ^N handler */
-                       default:
+                       switch (act) {
+                       case ESC_SAVE:
+                               esc_save[esc_len++] = ichar;
+                               continue;
+                       case ESC_REJECT:
                                esc_save[esc_len++] = ichar;
                                cread_add_str(esc_save, esc_len, insert,
                                              &num, &eol_num, buf, *len);
                                esc_len = 0;
                                continue;
+                       case ESC_CONVERTED:
+                               esc_len = 0;
+                               break;
                        }
                }
 
@@ -530,12 +571,6 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,
                        return -2;      /* timed out */
                WATCHDOG_RESET();       /* Trigger watchdog, if needed */
 
-#ifdef CONFIG_SHOW_ACTIVITY
-               while (!tstc()) {
-                       show_activity(0);
-                       WATCHDOG_RESET();
-               }
-#endif
                c = getc();
 
                /*
@@ -597,7 +632,7 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,
                                        puts(tab_seq + (col & 07));
                                        col += 8 - (col & 07);
                                } else {
-                                       char buf[2];
+                                       char __maybe_unused buf[2];
 
                                        /*
                                         * Echo input using puts() to force an