Skip to content

[HUST CSE][finsh] reset shell line state on overflow #11344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Telecaster2147 wants to merge 1 commit into
base: master
Choose a base branch
from
+50 −7
Open

[HUST CSE][finsh] reset shell line state on overflow #11344

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 50 additions & 7 deletions components/finsh/shell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,38 @@ static void shell_push_history(struct finsh_shell *shell)
}
#endif

static void finsh_shell_reset_line(struct finsh_shell *shell)
{
rt_memset(shell->line, 0, sizeof(shell->line));
shell->line_position = 0;
shell->line_curpos = 0;
}

static rt_bool_t finsh_shell_check_line(struct finsh_shell *shell)
{
if ((shell->line_position > FINSH_CMD_SIZE) ||
(shell->line_curpos > shell->line_position))
{
finsh_shell_reset_line(shell);

return RT_FALSE;
}

shell->line[FINSH_CMD_SIZE] = '\0';

return RT_TRUE;
}

static void finsh_shell_update_line_length(struct finsh_shell *shell)
{
rt_size_t length;

shell->line[FINSH_CMD_SIZE] = '\0';
length = rt_strnlen(shell->line, FINSH_CMD_SIZE);
shell->line[length] = '\0';
shell->line_curpos = shell->line_position = (rt_uint16_t)length;
}

#if defined(FINSH_USING_WORD_OPERATION)
static int find_prev_word_start(const char *line, int curpos)
{
Expand Down Expand Up @@ -683,6 +715,12 @@ static void finsh_thread_entry(void *parameter)
#if defined(FINSH_USING_FUNC_EXT)
else if (ch >= 0x31 && ch <= 0x34) /* home(0x31), insert(0x32), del(0x33), end(0x34) */
{
if (shell->line_position >= FINSH_CMD_SIZE)
{
finsh_shell_reset_line(shell);
continue;
}

shell->stat = WAIT_EXT_KEY;
shell->line[shell->line_position + 1] = ch; /* store the key code */
continue;
Expand Down Expand Up @@ -714,7 +752,8 @@ static void finsh_thread_entry(void *parameter)
else if (key_code == 0x33) /* del key */
{
/* delete character at current cursor position */
if (shell->line_curpos < shell->line_position)
if (finsh_shell_check_line(shell) &&
(shell->line_curpos < shell->line_position))
{
int i;
shell->line_position--;
Expand Down Expand Up @@ -745,6 +784,9 @@ static void finsh_thread_entry(void *parameter)
#endif /*defined(FINSH_USING_FUNC_EXT) */
}

if (!finsh_shell_check_line(shell))
continue;

/* received null or error */
if (ch == '\0' || ch == 0xFF) continue;
/* handle tab key */
Expand All @@ -758,7 +800,7 @@ static void finsh_thread_entry(void *parameter)
/* auto complete */
shell_auto_complete(&shell->line[0]);
/* re-calculate position */
shell->line_curpos = shell->line_position = (rt_uint16_t)rt_strlen(shell->line);
finsh_shell_update_line_length(shell);

continue;
}
Expand Down Expand Up @@ -843,14 +885,16 @@ static void finsh_thread_entry(void *parameter)
msh_exec(shell->line, shell->line_position);

rt_kprintf("%s", FINSH_PROMPT);
rt_memset(shell->line, 0, sizeof(shell->line));
shell->line_curpos = shell->line_position = 0;
finsh_shell_reset_line(shell);
continue;
}

/* it's a large line, discard it */
if (shell->line_position >= FINSH_CMD_SIZE)
shell->line_position = 0;
{
finsh_shell_reset_line(shell);
continue;
}

/* normal character */
if (shell->line_curpos < shell->line_position)
Expand Down Expand Up @@ -899,8 +943,7 @@ static void finsh_thread_entry(void *parameter)
if (shell->line_position >= FINSH_CMD_SIZE)
{
/* clear command line */
shell->line_position = 0;
shell->line_curpos = 0;
finsh_shell_reset_line(shell);
}
} /* end of device read */
}
Expand Down
Loading