| Message ID | 20240925182730.2035299-1-luiz.dentz@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [BlueZ,v1] shared/shell: Allow script command to be used within scripts | expand |
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=892874
---Test result---
Test Summary:
CheckPatch FAIL 0.70 seconds
GitLint PASS 0.33 seconds
BuildEll PASS 24.50 seconds
BluezMake PASS 1661.18 seconds
MakeCheck PASS 12.87 seconds
MakeDistcheck PASS 179.47 seconds
CheckValgrind PASS 252.10 seconds
CheckSmatch WARNING 355.16 seconds
bluezmakeextell PASS 118.97 seconds
IncrementalBuild PASS 1505.57 seconds
ScanBuild PASS 1041.24 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,v1] shared/shell: Allow script command to be used within scripts
ERROR:TRAILING_STATEMENTS: trailing statements should be on next line
#153: FILE: src/shared/shell.c:390:
+ while (bt_shell_input_line(input));
/github/workspace/src/src/13812385.patch total: 1 errors, 0 warnings, 68 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/src/13812385.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:
src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):
---
Regards,
Linux Bluetooth
diff --git a/src/shared/shell.c b/src/shared/shell.c index c31487190d0f..2100434f6b15 100644 --- a/src/shared/shell.c +++ b/src/shared/shell.c @@ -291,15 +291,14 @@ static int bt_shell_queue_exec(char *line) return err; } -static bool input_read(struct io *io, void *user_data) +static bool bt_shell_input_line(struct input *input) { - struct input *input = user_data; int fd; char *line = NULL; size_t len = 0; ssize_t nread; - fd = io_get_fd(io); + fd = io_get_fd(input->io); if (fd < 0) { printf("io_get_fd() returned %d\n", fd); @@ -336,7 +335,12 @@ static bool input_read(struct io *io, void *user_data) free(line); - return true; + return input->f ? true : false; +} + +static bool input_read(struct io *io, void *user_data) +{ + return bt_shell_input_line(user_data); } static bool input_hup(struct io *io, void *user_data) @@ -371,13 +375,25 @@ static struct input *input_new(int fd) static bool bt_shell_input_attach(int fd) { struct input *input; + struct queue *queue; input = input_new(fd); if (!input) return false; - io_set_read_handler(input->io, input_read, input, NULL); - io_set_disconnect_handler(input->io, input_hup, input, NULL); + /* Save executing queue so input lines can be placed in the correct + * order. + */ + queue = data.queue; + data.queue = queue_new(); + + while (bt_shell_input_line(input)); + + /* Push existing input lines back into the executing queue */ + while (!queue_isempty(queue)) + queue_push_tail(data.queue, queue_pop_head(queue)); + + queue_destroy(queue, free); return true; } @@ -396,7 +412,10 @@ static void cmd_script(int argc, char *argv[]) printf("Running script %s...\n", argv[1]); - bt_shell_input_attach(fd); + if (!bt_shell_input_attach(fd)) + return bt_shell_noninteractive_quit(EXIT_FAILURE); + + return bt_shell_noninteractive_quit(EXIT_SUCCESS); } static const struct bt_shell_menu_entry default_menu[] = {
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> This makes script command to allow the usage of script within the script file by saving existing execute queue and then replacing the line with script command with the lines of the input file. --- src/shared/shell.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-)