aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Thompson <daniel.thompson@linaro.org>2014-09-11 04:58:29 -0400
committerJason Wessel <jason.wessel@windriver.com>2015-02-19 13:39:03 -0500
commitab08e464a2cd8242fdc6e4f87f3480808364a97a (patch)
treeea25e537cc004b8c110bc3b55cc146268c2bbcd9
parent5454388113938d9592d6a6d5424469014da4ee86 (diff)
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: Daniel Thompson <daniel.thompson@linaro.org> Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
-rw-r--r--kernel/debug/kdb/kdb_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index 0a22f455060a..420418360b81 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -915,13 +915,12 @@ int kdb_parse(const char *cmdstr)
915 char *cp; 915 char *cp;
916 char *cpp, quoted; 916 char *cpp, quoted;
917 kdbtab_t *tp; 917 kdbtab_t *tp;
918 int i, escaped, ignore_errors = 0, check_grep; 918 int i, escaped, ignore_errors = 0, check_grep = 0;
919 919
920 /* 920 /*
921 * First tokenize the command string. 921 * First tokenize the command string.
922 */ 922 */
923 cp = (char *)cmdstr; 923 cp = (char *)cmdstr;
924 kdb_grepping_flag = check_grep = 0;
925 924
926 if (KDB_FLAG(CMD_INTERRUPT)) { 925 if (KDB_FLAG(CMD_INTERRUPT)) {
927 /* Previous command was interrupted, newline must not 926 /* 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 */ 1279 */
1281 kdb_nextline = 1; 1280 kdb_nextline = 1;
1282 KDB_STATE_CLEAR(SUPPRESS); 1281 KDB_STATE_CLEAR(SUPPRESS);
1282 kdb_grepping_flag = 0;
1283 1283
1284 cmdbuf = cmd_cur; 1284 cmdbuf = cmd_cur;
1285 *cmdbuf = '\0'; 1285 *cmdbuf = '\0';