diff options
| author | Tom Rini <[email protected]> | 2023-03-28 10:57:34 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-03-28 10:57:34 -0400 |
| commit | 27fbae57ab879bb02abb1784b1fb858dd6c2a0de (patch) | |
| tree | 09e08eefd123e358b5012df3dd88f233547b64d8 /common | |
| parent | 41a88ad529b3943b1e465846eb24fe2c29203e35 (diff) | |
| parent | be0169f07e38b81dd96bca2e80610592d89f8550 (diff) | |
Merge branch '2023-03-28-correct-several-cli_getch-bugs'
- Merge a regression fix (for an issue that we raised post v2023.01)
with cli_getch(), and include a test now.
Diffstat (limited to 'common')
| -rw-r--r-- | common/cli_getch.c | 5 | ||||
| -rw-r--r-- | common/cli_readline.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/cli_getch.c b/common/cli_getch.c index 87c23edcf4b..61d4cb261b8 100644 --- a/common/cli_getch.c +++ b/common/cli_getch.c @@ -129,7 +129,7 @@ static int cli_ch_esc(struct cli_ch_state *cch, int ichar, *actp = act; - return act == ESC_CONVERTED ? ichar : 0; + return ichar; } int cli_ch_process(struct cli_ch_state *cch, int ichar) @@ -145,6 +145,7 @@ int cli_ch_process(struct cli_ch_state *cch, int ichar) return cch->esc_save[cch->emit_upto++]; cch->emit_upto = 0; cch->emitting = false; + cch->esc_len = 0; } return 0; } else if (ichar == -ETIMEDOUT) { @@ -185,7 +186,7 @@ int cli_ch_process(struct cli_ch_state *cch, int ichar) cch->esc_save[cch->esc_len++] = ichar; ichar = cch->esc_save[cch->emit_upto++]; cch->emitting = true; - break; + return ichar; case ESC_CONVERTED: /* valid escape sequence, return the resulting char */ cch->esc_len = 0; diff --git a/common/cli_readline.c b/common/cli_readline.c index 709e9c3d38b..e83743e90c9 100644 --- a/common/cli_readline.c +++ b/common/cli_readline.c @@ -284,10 +284,9 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len, } ichar = getcmd_getch(); + ichar = cli_ch_process(cch, ichar); } - ichar = cli_ch_process(cch, ichar); - /* ichar=0x0 when error occurs in U-Boot getc */ if (!ichar) continue; |