libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #870 from armink/fix_shell 

[Finsh] Stop push new history when current cmd is same as last cmd.
This commit is contained in:
Bernard Xiong 2017-10-13 11:43:28 +08:00 committed by GitHub
parent db88c0b6a2 c123451585
commit c5e8d9d757
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/finsh/shell.c
View File

@ -371,6 +371,9 @@ static void shell_push_history(struct finsh_shell *shell)
{ {
/* push history */ /* push history */
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 (memcmp(&shell->cmd_history[FINSH_HISTORY_LINES - 1], shell->line, shell->line_position))
{ {
/* move history */ /* move history */
int index; int index;
@ -385,8 +388,13 @@ static void shell_push_history(struct finsh_shell *shell)
/* it's the maximum history */ /* it's the maximum history */
shell->history_count = FINSH_HISTORY_LINES; shell->history_count = FINSH_HISTORY_LINES;
} }
}
else else
{ {
/* 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))
{
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);
memcpy(&shell->cmd_history[shell->history_count][0], shell->line, shell->line_position); memcpy(&shell->cmd_history[shell->history_count][0], shell->line, shell->line_position);
@ -394,6 +402,7 @@ static void shell_push_history(struct finsh_shell *shell)
shell->history_count ++; shell->history_count ++;
} }
} }
}
shell->current_history = shell->history_count; shell->current_history = shell->history_count;
} }
#endif #endif