shared/shell: Add non-interactive mode
Luiz Augusto von Dentz
maintainerPATCH 1/3 shared/shell: Add non-interactive mode
From: Luiz Augusto von Dentz <[email protected]>
This detects if any command was given as parameter, execute it and exit disabling all other outputs:
bluetoothctl list
Controller 00:1B:DC:07:31:88 Vudentz's T460s #1 [default] Controller B8:8A:60:D8:17:D7 BlueZ-1
It is also possible to run interactive command with use of timeout option:
bluetoothctl --timeout=10 advertise on
Agent registered
[CHG] Controller 00:1B:DC:07:31:88 SupportedInstances: 0x04 [CHG] Controller 00:1B:DC:07:31:88 ActiveInstances: 0x01 Advertising object registered
Tx Power: off
Name: off
Apperance: off
--- src/shared/shell.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-)
src/shared/shell.c +35 -2
@@ -62,6 +62,10 @@ struct bt_shell_env { }; static struct { + int argc; + char **argv; + bool nint; + int nint_to; struct io *input; bool saved_prompt;
@@ -373,6 +377,9 @@ void bt_shell_printf(const char *fmt, ...)char *saved_line;int saved_point; +if (!data.input) +return ; + save_input = !RL_ISSTATE (RL_STATE_DONE );if (save_input) {
@@ -747,6 +754,7 @@ static void rl_init(void)static const struct option main_options[] = { {"version" , no_argument,0 ,'v' }, {"help" , no_argument,0 ,'h' }, + {"timeout" , required_argument,0 ,'t' }, };static void usage (int argc,char **argv,const struct bt_shell_opt *opt)
@@ -762,7 +770,8 @@ static void usage(int argc, char **argv, const struct bt_shell_opt *opt)for (i =0 ; opt && opt->options[i].name; i++)printf ("\t--%s \t%s\n" , opt->options[i].name, opt->help[i]); -printf ("\t--version \tDisplay version\n" +printf ("\t--timeout \t\tTimeout in seconds for non-interactive mode\n" +"\t--version \tDisplay version\n" "\t--help \t\tDisplay help\n" ); }
@@ -794,6 +803,9 @@ void bt_shell_init(int argc, char **argv, const struct bt_shell_opt *opt)usage (argc, argv, opt);exit (EXIT_SUCCESS );return ; +case 't' : + data.nint_to =atoi (optarg); +break ;default :if (c != opt->options[index - offset].val) {usage (argc, argv, opt);
@@ -805,6 +817,10 @@ void bt_shell_init(int argc, char **argv, const struct bt_shell_opt *opt) } } + data.argc = argc - optind; + data.argv = argv + optind; + data.nint = (data.argc >0 ); + main_loop =g_main_loop_new (NULL , FALSE);rl_init ();
@@ -876,7 +892,7 @@ bool bt_shell_add_submenu(const struct bt_shell_menu *menu)void bt_shell_set_prompt (const char *string) { -if (!main_loop) +if (!main_loop || data.nint)return ;rl_set_prompt (string);
@@ -891,6 +907,13 @@ static bool input_read(struct io *io, void *user_data)return true; } +static gboolean shell_quit (void *data) +{ +g_main_loop_quit (main_loop); + +return FALSE; +} +bool bt_shell_attach (int fd) {struct io *io;
@@ -906,6 +929,16 @@ bool bt_shell_attach(int fd) data.input = io; +if (data.nint) { +shell_exec (data.argc, data.argv); + +if (!data.nint_to) { +bt_shell_detach (); +g_main_loop_quit (main_loop); + }else +g_timeout_add_seconds (data.nint_to, shell_quit,NULL ); + } +return true; }
Signature · 1 line
2.14.3
Luiz Augusto von Dentz
maintainerPATCH 2/3 tools/bluetooth-player: Only enable attach input when connected
From: Luiz Augusto von Dentz <[email protected]>
--- tools/bluetooth-player.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/bluetooth-player.c +2 -1
@@ -57,11 +57,13 @@ static GList *items = NULL;static void connect_handler (DBusConnection *connection,void *user_data) { +bt_shell_attach (fileno (stdin));bt_shell_set_prompt (PROMPT_ON ); }static void disconnect_handler (DBusConnection *connection,void *user_data) { +bt_shell_detach ();bt_shell_set_prompt (PROMPT_OFF ); }
@@ -1124,7 +1126,6 @@ int main(int argc, char *argv[])bt_shell_init (argc, argv,NULL );bt_shell_set_menu (&main_menu);bt_shell_set_prompt (PROMPT_OFF ); -bt_shell_attach (fileno (stdin)); dbus_conn =g_dbus_setup_bus (DBUS_BUS_SYSTEM ,NULL ,NULL );
Signature · 1 line
2.14.3
Luiz Augusto von Dentz
maintainerPATCH 3/3 tools/obexctl: Only enable attach input when connected
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
--- tools/obexctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/obexctl.c +2 -1
@@ -75,11 +75,13 @@ struct transfer_data {static void connect_handler (DBusConnection *connection,void *user_data) { +bt_shell_attach (fileno (stdin));bt_shell_set_prompt (PROMPT_ON ); }static void disconnect_handler (DBusConnection *connection,void *user_data) { +bt_shell_detach ();bt_shell_set_prompt (PROMPT_OFF ); }
@@ -2111,7 +2113,6 @@ int main(int argc, char *argv[])bt_shell_init (argc, argv,NULL );bt_shell_set_menu (&main_menu);bt_shell_set_prompt (PROMPT_OFF ); -bt_shell_attach (fileno (stdin)); dbus_conn =g_dbus_setup_bus (DBUS_BUS_SESSION ,NULL ,NULL );
Signature · 1 line
2.14.3