Skip to content

Commit

Permalink
kdb: Fix a prompt management bug when using | grep
Browse files Browse the repository at this point in the history
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: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
  • Loading branch information
Daniel Thompson authored and Jason Wessel committed Feb 19, 2015
1 parent 5454388 commit ab08e46
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions kernel/debug/kdb/kdb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -915,13 +915,12 @@ int kdb_parse(const char *cmdstr)
char *cp;
char *cpp, quoted;
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.
*/
cp = (char *)cmdstr;
kdb_grepping_flag = check_grep = 0;

if (KDB_FLAG(CMD_INTERRUPT)) {
/* Previous command was interrupted, newline must not
Expand Down Expand Up @@ -1280,6 +1279,7 @@ static int kdb_local(kdb_reason_t reason, int error, struct pt_regs *regs,
*/
kdb_nextline = 1;
KDB_STATE_CLEAR(SUPPRESS);
kdb_grepping_flag = 0;

cmdbuf = cmd_cur;
*cmdbuf = '\0';
Expand Down

0 comments on commit ab08e46

Please sign in to comment.