libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #927 from armink/fix_shell 

[Finsh] Fix an auto complete history bug.
This commit is contained in:
Bernard Xiong 2017-11-01 13:44:56 +08:00 committed by GitHub
parent 85b17e9158 82b7ecda06
commit 832d8b4e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/finsh/shell.c
View File

@ -372,7 +372,7 @@ static void shell_push_history(struct finsh_shell *shell)
if (shell->history_count >= FINSH_HISTORY_LINES) if (shell->history_count >= FINSH_HISTORY_LINES)
{ {
/* if current cmd is same as last cmd, don't push */ /* if current cmd is same as last cmd, don't push */
if (memcmp(&shell->cmd_history[FINSH_HISTORY_LINES - 1], shell->line, shell->line_position)) if (memcmp(&shell->cmd_history[FINSH_HISTORY_LINES - 1], shell->line, FINSH_CMD_SIZE))
{ {
/* move history */ /* move history */
int index; int index;
@ -391,7 +391,7 @@ static void shell_push_history(struct finsh_shell *shell)
else else
{ {
/* if current cmd is same as last cmd, don't push */ /* if current cmd is same as last cmd, don't push */
if (shell->history_count == 0 || memcmp(&shell->cmd_history[shell->history_count - 1], shell->line, shell->line_position)) if (shell->history_count == 0 || memcmp(&shell->cmd_history[shell->history_count - 1], shell->line, FINSH_CMD_SIZE))
{ {
shell->current_history = shell->history_count; shell->current_history = shell->history_count;
memset(&shell->cmd_history[shell->history_count][0], 0, FINSH_CMD_SIZE); memset(&shell->cmd_history[shell->history_count][0], 0, FINSH_CMD_SIZE);