adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

llext: shell: fix command completions

Browse source 
Dynamic command handlers should be fully initialized to avoid undefined
behavior. Also, fix the number of arguments required by each command,
since llext_call_fn requires both the llext and the name of the function
to be called.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
This commit is contained in:
Luca Burelli 2023-12-01 18:59:08 +01:00 committed by Anas Nashif
parent 1732177530
commit 57e1dc337a
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
subsys/llext/shell.c
View file

@ -81,10 +81,21 @@ static void llext_name_get(size_t idx, struct shell_static_entry *entry)
entry->syntax = cmd.ext ? cmd.ext->name : NULL;
entry->help = NULL;
entry->subcmd = NULL;
entry->handler = NULL;
entry->args.mandatory = 0;
entry->args.optional = 0;
}
SHELL_DYNAMIC_CMD_CREATE(msub_llext_name, llext_name_get);
static void llext_name_arg_get(size_t idx, struct shell_static_entry *entry)
{
llext_name_get(idx, entry);
if (entry->syntax) {
entry->args.mandatory = 1;
}
}
SHELL_DYNAMIC_CMD_CREATE(msub_llext_name_arg, llext_name_arg_get);
struct llext_shell_list {
const struct shell *sh;
};
@ -175,12 +186,11 @@ static int cmd_llext_call_fn(const struct shell *sh, size_t argc, char *argv[])
/* clang-format off */
SHELL_STATIC_SUBCMD_SET_CREATE(sub_llext,
SHELL_CMD(list, NULL, LLEXT_LIST_HELP, cmd_llext_list),
SHELL_CMD_ARG(load_hex, NULL, LLEXT_LOAD_HEX_HELP, cmd_llext_load_hex,
3, 0),
SHELL_CMD_ARG(load_hex, NULL, LLEXT_LOAD_HEX_HELP, cmd_llext_load_hex, 3, 0),
SHELL_CMD_ARG(unload, &msub_llext_name, LLEXT_UNLOAD_HELP, cmd_llext_unload, 2, 0),
SHELL_CMD_ARG(list_symbols, &msub_llext_name, LLEXT_LIST_SYMBOLS_HELP,
cmd_llext_list_symbols, 2, 0),
SHELL_CMD_ARG(call_fn, &msub_llext_name, LLEXT_CALL_FN_HELP,
SHELL_CMD_ARG(call_fn, &msub_llext_name_arg, LLEXT_CALL_FN_HELP,
cmd_llext_call_fn, 3, 0),
SHELL_SUBCMD_SET_END