diff options
Diffstat (limited to 'tools/hcitool.c')
| -rw-r--r-- | tools/hcitool.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/tools/hcitool.c b/tools/hcitool.c index f2e4fa4a..c2df8e3f 100644 --- a/tools/hcitool.c +++ b/tools/hcitool.c @@ -46,8 +46,8 @@ #include <bluetooth/hci.h> #include <bluetooth/hci_lib.h> -#include "textfile.h" -#include "oui.h" +#include "src/textfile.h" +#include "src/oui.h" /* Unofficial value, might still change */ #define LE_LINK 0x03 @@ -336,25 +336,32 @@ static char *get_minor_device_name(int major, int minor) case 0: break; case 1: - strncat(cls_str, "Joystick", sizeof(cls_str) - strlen(cls_str)); + strncat(cls_str, "Joystick", + sizeof(cls_str) - strlen(cls_str) - 1); break; case 2: - strncat(cls_str, "Gamepad", sizeof(cls_str) - strlen(cls_str)); + strncat(cls_str, "Gamepad", + sizeof(cls_str) - strlen(cls_str) - 1); break; case 3: - strncat(cls_str, "Remote control", sizeof(cls_str) - strlen(cls_str)); + strncat(cls_str, "Remote control", + sizeof(cls_str) - strlen(cls_str) - 1); break; case 4: - strncat(cls_str, "Sensing device", sizeof(cls_str) - strlen(cls_str)); + strncat(cls_str, "Sensing device", + sizeof(cls_str) - strlen(cls_str) - 1); break; case 5: - strncat(cls_str, "Digitizer tablet", sizeof(cls_str) - strlen(cls_str)); - break; + strncat(cls_str, "Digitizer tablet", + sizeof(cls_str) - strlen(cls_str) - 1); + break; case 6: - strncat(cls_str, "Card reader", sizeof(cls_str) - strlen(cls_str)); + strncat(cls_str, "Card reader", + sizeof(cls_str) - strlen(cls_str) - 1); break; default: - strncat(cls_str, "(reserved)", sizeof(cls_str) - strlen(cls_str)); + strncat(cls_str, "(reserved)", + sizeof(cls_str) - strlen(cls_str) - 1); break; } if (strlen(cls_str) > 0) @@ -954,6 +961,7 @@ static void cmd_info(int dev_id, int argc, char **argv) htobs(di.pkt_type & ACL_PTYPE_MASK), 0, 0x01, &handle, 25000) < 0) { perror("Can't create connection"); + free(cr); close(dd); exit(1); } @@ -962,6 +970,8 @@ static void cmd_info(int dev_id, int argc, char **argv) } else handle = htobs(cr->conn_info->handle); + free(cr); + printf("\tBD Address: %s\n", argv[0]); comp = batocomp(&bdaddr); |