michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: Refactor command execution to enable raw arguments

Browse source 
Added special flag that can be used to indicate that optional
arguments are passed without any parsing (e.g. quotation marks
removal). Modified execute command to parse command line buffer
argument by argument.

After this change it is possible to forward whole command to
command handler (using select).

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2020-04-14 09:01:57 +02:00 • committed by Kumar Gala
commit 512de5ecac
5 changed files with 184 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

21
subsys/shell/shell_utils.h
View file

@ -36,7 +36,8 @@ static inline u16_t shell_strlen(const char *str)
return str == NULL ? 0U : (u16_t)strlen(str);
}
char shell_make_argv(size_t *argc, char **argv, char *cmd, uint8_t max_argc);
char shell_make_argv(size_t *argc, const char **argv,
char *cmd, uint8_t max_argc);
/** @brief Removes pattern and following space
*
@ -56,11 +57,15 @@ const struct shell_static_entry *shell_cmd_get(
size_t idx,
struct shell_static_entry *dloc);
const struct shell_static_entry *shell_find_cmd(
const struct shell_static_entry *parent,
const char *cmd_str,
struct shell_static_entry *dloc);
/* @internal @brief Function returns pointer to a shell's subcommands array
* for a level given by argc and matching command patter provided in argv.
*
* @param shell Shell instance.
* @param shell Entry. NULL for root entry.
* @param argc Number of arguments.
* @param argv Pointer to an array with arguments.
* @param match_arg Subcommand level of last matching argument.
@ -70,12 +75,12 @@ const struct shell_static_entry *shell_cmd_get(
* @return Pointer to found command.
*/
const struct shell_static_entry *shell_get_last_command(
const struct shell *shell,
size_t argc,
char *argv[],
size_t *match_arg,
struct shell_static_entry *d_entry,
bool only_static);
const struct shell_static_entry *entry,
size_t argc,
const char *argv[],
size_t *match_arg,
struct shell_static_entry *dloc,
bool only_static);
int shell_command_add(char *buff, u16_t *buff_len,
const char *new_cmd, const char *pattern);