RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

sys/shell: make shell_handle_input_line() public

Browse Source
This commit is contained in:
Benjamin Valentin 2024-04-30 11:19:34 +02:00
parent 9c4ca01e24
commit 138a94bae4
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/include/shell.h
View File

@ -225,6 +225,18 @@ static inline void shell_run(const shell_command_t *commands,
shell_run_forever(commands, line_buf, len);
}
/**
* @brief Parse and run a line of text as a shell command with
* arguments.
*
* @param[in] commands ptr to array of command structs
* @param[in] line The input line to parse
*
* @returns return value of the found command
* @returns -ENOEXEC if no valid command could be found
*/
int shell_handle_input_line(const shell_command_t *commands, char *line);
#ifndef __cplusplus
/**
* @brief Define shell command

14
sys/shell/shell.c
View File

@ -206,7 +206,7 @@ static void print_help(const shell_command_t *command_list)
*
*
*/
static void handle_input_line(const shell_command_t *command_list, char *line)
int shell_handle_input_line(const shell_command_t *command_list, char *line)
{
/* first we need to calculate the number of arguments */
int argc = 0;
@ -297,11 +297,11 @@ static void handle_input_line(const shell_command_t *command_list, char *line)
if (pstate != PARSE_BLANK && pstate != PARSE_UNQUOTED) {
printf("shell: incorrect quoting\n");
return;
return -EINVAL;
}
if (argc == 0) {
return;
return 0;
}
/* then we fill the argv array */
@ -327,19 +327,23 @@ static void handle_input_line(const shell_command_t *command_list, char *line)
shell_pre_command_hook(argc, argv);
int res = handler(argc, argv);
shell_post_command_hook(res, argc, argv);
return res;
}
else {
handler(argc, argv);
return handler(argc, argv);
}
}
else {
if (strcmp("help", argv[0]) == 0) {
print_help(command_list);
return 0;
}
else {
printf("shell: command not found: %s\n", argv[0]);
}
}
return -ENOEXEC;
}
__attribute__((weak)) void shell_post_readline_hook(void)
@ -518,7 +522,7 @@ void shell_run_once(const shell_command_t *shell_commands,
break;
default:
handle_input_line(shell_commands, line_buf);
shell_handle_input_line(shell_commands, line_buf);
break;
}