From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ] shared/shell: Introduce bt_shell_exec
Date: Tue, 1 Mar 2022 15:30:44 -0800 [thread overview]
Message-ID: <20220301233045.109794-1-luiz.dentz@gmail.com> (raw)
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This introduces bt_shell_exec which can be used to inject commands into
a bt_shell without using stdin/user input.
---
src/shared/shell.c | 34 ++++++++++++++++++++++++----------
src/shared/shell.h | 1 +
2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/shared/shell.c b/src/shared/shell.c
index cbb9b8b88..0d82bc282 100644
--- a/src/shared/shell.c
+++ b/src/shared/shell.c
@@ -678,7 +678,6 @@ int bt_shell_release_prompt(const char *input)
static void rl_handler(char *input)
{
- wordexp_t w;
HIST_ENTRY *last;
if (!input) {
@@ -703,16 +702,8 @@ static void rl_handler(char *input)
if (data.monitor)
bt_log_printf(0xffff, data.name, LOG_INFO, "%s", input);
- if (wordexp(input, &w, WRDE_NOCMD))
- goto done;
-
- if (w.we_wordc == 0) {
- wordfree(&w);
- goto done;
- }
+ bt_shell_exec(input);
- shell_exec(w.we_wordc, w.we_wordv);
- wordfree(&w);
done:
free(input);
}
@@ -1178,6 +1169,29 @@ int bt_shell_run(void)
return status;
}
+int bt_shell_exec(const char *input)
+{
+ wordexp_t w;
+ int err;
+
+ if (!input)
+ return 0;
+
+ if (wordexp(input, &w, WRDE_NOCMD))
+ return -ENOEXEC;
+
+ if (w.we_wordc == 0) {
+ wordfree(&w);
+ return -ENOEXEC;
+ }
+
+ err = shell_exec(w.we_wordc, w.we_wordv);
+
+ wordfree(&w);
+
+ return err;
+}
+
void bt_shell_cleanup(void)
{
bt_shell_release_prompt("");
diff --git a/src/shared/shell.h b/src/shared/shell.h
index cc4f822fb..8baa2854a 100644
--- a/src/shared/shell.h
+++ b/src/shared/shell.h
@@ -55,6 +55,7 @@ struct bt_shell_opt {
void bt_shell_init(int argc, char **argv, const struct bt_shell_opt *opt);
int bt_shell_run(void);
+int bt_shell_exec(const char *input);
void bt_shell_quit(int status);
void bt_shell_noninteractive_quit(int status);
--
2.35.1
next reply other threads:[~2022-03-01 23:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 23:30 Luiz Augusto von Dentz [this message]
2022-03-02 0:44 ` [BlueZ] shared/shell: Introduce bt_shell_exec bluez.test.bot
2022-03-02 23:22 ` Luiz Augusto von Dentz
-- strict thread matches above, loose matches on Subject: below --
2022-03-01 0:00 [PATCH BlueZ] " Luiz Augusto von Dentz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220301233045.109794-1-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox