michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: Use temp_buffer in tab completion

Browse source 
Change common_beginning_find() to use temp_buffer for storing first
command when algorithm compares commands in search for common
beginning. It is done to support cases where syntax returned by
dynamic commands is transient (e.g. single static buffer is used
for to build syntax).

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2019-10-17 12:16:54 +02:00 • committed by Anas Nashif
commit 61d12cad78
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
subsys/shell/shell.c
View file

@ -28,7 +28,6 @@
#define SHELL_INIT_OPTION_PRINTER (NULL) #define SHELL_INIT_OPTION_PRINTER (NULL)
static inline void receive_state_change(const struct shell *shell, static inline void receive_state_change(const struct shell *shell,
enum shell_receive_state state) enum shell_receive_state state)
{ {
@ -440,6 +439,8 @@ static u16_t common_beginning_find(const struct shell *shell,
shell_cmd_get(shell, cmd ? cmd->subcmd : NULL, cmd ? 1 : 0, shell_cmd_get(shell, cmd ? cmd->subcmd : NULL, cmd ? 1 : 0,
first, &match, &dynamic_entry); first, &match, &dynamic_entry);
strncpy(shell->ctx->temp_buff, match->syntax,
sizeof(shell->ctx->temp_buff));
*str = match->syntax; *str = match->syntax;
@ -455,7 +456,7 @@ static u16_t common_beginning_find(const struct shell *shell,
break; break;
} }
curr_common = str_common(match->syntax, match2->syntax, curr_common = str_common(shell->ctx->temp_buff, match2->syntax,
UINT16_MAX); UINT16_MAX);
if ((arg_len == 0U) || (curr_common >= arg_len)) { if ((arg_len == 0U) || (curr_common >= arg_len)) {
--cnt; --cnt;