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.
Showing the changes to kernel/debug (1 of 1 file). Show all
Unified · Split
| @@ -915,13 +915,12 @@ int kdb_parse(const char *cmdstr) · 914 unmodified lines | |||
| 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, · 352 unmodified lines | |||
| 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'; |