diff options
| author | ERAMOTO Masaya <eramoto.masaya@jp.fujitsu.com> | 2017-11-17 16:22:31 +0900 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2017-11-17 16:08:35 +0200 |
| commit | 5202ff40cf649f68b7d2a81ac794091db224eef2 (patch) | |
| tree | 67e2d67d04dd39c3c30c7d8cd81ba2823f0bbe46 /tools/btmgmt.c | |
| parent | f444a1bd4bd9f6060d3e4374a7af3524f10260a9 (diff) | |
| download | bluez-5202ff40cf649f68b7d2a81ac794091db224eef2.tar.gz | |
tools/btmgmt: Use set_index() for --index
The command select can also set the specified index even if prefix hci
includes uppercase characters.
Diffstat (limited to 'tools/btmgmt.c')
| -rw-r--r-- | tools/btmgmt.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/tools/btmgmt.c b/tools/btmgmt.c index e218a87ff..3911ba268 100644 --- a/tools/btmgmt.c +++ b/tools/btmgmt.c @@ -93,7 +93,7 @@ static void set_index(char *arg) if (!arg || !strcmp(arg, "none") || !strcmp(arg, "any") || !strcmp(arg, "all")) mgmt_index = MGMT_INDEX_NONE; - else if (!strncmp(arg, "hci", 3)) + else if(strlen(arg) > 3 && !strncasecmp(arg, "hci", 3)) mgmt_index = atoi(&arg[3]); else mgmt_index = atoi(arg); @@ -4810,18 +4810,13 @@ static void mgmt_debug(const char *str, void *user_data) int main(int argc, char *argv[]) { struct io *input; - uint16_t index = MGMT_INDEX_NONE; int status, opt; while ((opt = getopt_long(argc, argv, "+hi:", main_options, NULL)) != -1) { switch (opt) { case 'i': - if (strlen(optarg) > 3 && - strncasecmp(optarg, "hci", 3) == 0) - index = atoi(optarg + 3); - else - index = atoi(optarg); + set_index(optarg); break; case 'h': default: @@ -4855,10 +4850,10 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - c->func(mgmt, index, argc, argv); + c->func(mgmt, mgmt_index, argc, argv); } - register_mgmt_callbacks(mgmt, index); + register_mgmt_callbacks(mgmt, mgmt_index); /* Interactive mode */ if (!argc) @@ -4874,12 +4869,10 @@ int main(int argc, char *argv[]) rl_erase_empty_line = 1; rl_callback_handler_install(NULL, rl_handler); - update_prompt(index); + update_prompt(mgmt_index); rl_redisplay(); } - mgmt_index = index; - status = mainloop_run(); if (input) { |