Commit ab08e464 authored by Daniel Thompson's avatar Daniel Thompson Committed by Jason Wessel

kdb: Fix a prompt management bug when using | grep

Currently when the "| grep" feature is used to filter the output of a
command then the prompt is not displayed for the subsequent command.
Likewise any characters typed by the user are also not echoed to the
display. This rather disconcerting problem eventually corrects itself
when the user presses Enter and the kdb_grepping_flag is cleared as
kdb_parse() tries to make sense of whatever they typed.

This patch resolves the problem by moving the clearing of this flag
from the middle of command processing to the beginning.
Signed-off-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
parent 54543881
...@@ -915,13 +915,12 @@ int kdb_parse(const char *cmdstr) ...@@ -915,13 +915,12 @@ int kdb_parse(const char *cmdstr)
char *cp; char *cp;
char *cpp, quoted; char *cpp, quoted;
kdbtab_t *tp; kdbtab_t *tp;
int i, escaped, ignore_errors = 0, check_grep; int i, escaped, ignore_errors = 0, check_grep = 0;
/* /*
* First tokenize the command string. * First tokenize the command string.
*/ */
cp = (char *)cmdstr; cp = (char *)cmdstr;
kdb_grepping_flag = check_grep = 0;
if (KDB_FLAG(CMD_INTERRUPT)) { if (KDB_FLAG(CMD_INTERRUPT)) {
/* Previous command was interrupted, newline must not /* Previous command was interrupted, newline must not
...@@ -1280,6 +1279,7 @@ static int kdb_local(kdb_reason_t reason, int error, struct pt_regs *regs, ...@@ -1280,6 +1279,7 @@ static int kdb_local(kdb_reason_t reason, int error, struct pt_regs *regs,
*/ */
kdb_nextline = 1; kdb_nextline = 1;
KDB_STATE_CLEAR(SUPPRESS); KDB_STATE_CLEAR(SUPPRESS);
kdb_grepping_flag = 0;
cmdbuf = cmd_cur; cmdbuf = cmd_cur;
*cmdbuf = '\0'; *cmdbuf = '\0';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment