client: Fix stay on error handling in non-interactive
Returns the FAILURE status since there is no meaning of stay in
non-interactive mode when executing some commands with an invalid
argument or with no controller. Also returns with the SUCCESS status
when getting a scan filtering value or disconnecting a non-default
device.
diff --git a/client/advertising.c b/client/advertising.c
index 4517f8f..152a22a 100644
--- a/client/advertising.c
+++ b/client/advertising.c
@@ -644,7 +644,7 @@
}
if (ad.tx_power == *value)
- return;
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
ad.tx_power = *value;
diff --git a/client/main.c b/client/main.c
index 9cc0a29..584217a 100644
--- a/client/main.c
+++ b/client/main.c
@@ -840,7 +840,7 @@
if (argc < 2 || !strlen(argv[1])) {
if (check_default_ctrl() == FALSE)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
proxy = default_ctrl->proxy;
} else {
@@ -848,7 +848,7 @@
if (!adapter) {
bt_shell_printf("Controller %s not available\n",
argv[1]);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
proxy = adapter->proxy;
}
@@ -960,7 +960,7 @@
char *name;
if (check_default_ctrl() == FALSE)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
name = g_strdup(argv[1]);
@@ -977,7 +977,7 @@
char *name;
if (check_default_ctrl() == FALSE)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
name = g_strdup("");
@@ -995,10 +995,10 @@
char *str;
if (!parse_argument(argc, argv, NULL, NULL, &powered, NULL))
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
if (check_default_ctrl() == FALSE)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
str = g_strdup_printf("power %s", powered == TRUE ? "on" : "off");
@@ -1016,10 +1016,10 @@
char *str;
if (!parse_argument(argc, argv, NULL, NULL, &pairable, NULL))
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
if (check_default_ctrl() == FALSE)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
str = g_strdup_printf("pairable %s", pairable == TRUE ? "on" : "off");
@@ -1039,10 +1039,10 @@
char *str;
if (!parse_argument(argc, argv, NULL, NULL, &discoverable, NULL))
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
if (check_default_ctrl() == FALSE)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
str = g_strdup_printf("discoverable %s",
discoverable == TRUE ? "on" : "off");
@@ -1202,10 +1202,10 @@
const char *method;
if (!parse_argument(argc, argv, NULL, NULL, &enable, NULL))
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
if (check_default_ctrl() == FALSE)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
if (enable == TRUE) {
set_discovery_filter();
@@ -1230,7 +1230,7 @@
for (uuid = filter.uuids; uuid && *uuid; uuid++)
print_uuid(*uuid);
- return;
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
g_strfreev(filter.uuids);
@@ -1257,7 +1257,7 @@
if (argc < 2 || !strlen(argv[1])) {
if (filter.rssi != DISTANCE_VAL_INVALID)
bt_shell_printf("RSSI: %d\n", filter.rssi);
- return;
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
filter.pathloss = DISTANCE_VAL_INVALID;
@@ -1272,7 +1272,7 @@
if (filter.pathloss != DISTANCE_VAL_INVALID)
bt_shell_printf("Pathloss: %d\n",
filter.pathloss);
- return;
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
filter.rssi = DISTANCE_VAL_INVALID;
@@ -1287,7 +1287,7 @@
if (filter.transport)
bt_shell_printf("Transport: %s\n",
filter.transport);
- return;
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
g_free(filter.transport);
@@ -1301,7 +1301,7 @@
if (argc < 2 || !strlen(argv[1])) {
bt_shell_printf("DuplicateData: %s\n",
filter.duplicate ? "on" : "off");
- return;
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
if (!strcmp(argv[1], "on"))
@@ -1310,7 +1310,7 @@
filter.duplicate = false;
else {
bt_shell_printf("Invalid option: %s\n", argv[1]);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
filter.set = false;
@@ -1412,12 +1412,12 @@
all = true;
if (!data_clear(filter_clear, all ? "all" : argv[1]))
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
filter.set = false;
if (check_default_ctrl() == FALSE)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
set_discovery_filter();
}
@@ -1667,7 +1667,7 @@
GDBusProxy *proxy;
if (check_default_ctrl() == FALSE)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
if (strcmp(argv[1], "*") == 0) {
GList *list;
@@ -1684,7 +1684,7 @@
proxy = find_proxy_by_address(default_ctrl->devices, argv[1]);
if (!proxy) {
bt_shell_printf("Device %s not available\n", argv[1]);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
remove_device(proxy);
@@ -1746,10 +1746,8 @@
bt_shell_printf("Successful disconnected\n");
- if (proxy != default_dev)
- return;
-
- set_default_device(NULL, NULL);
+ if (proxy == default_dev)
+ set_default_device(NULL, NULL);
return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
@@ -1799,7 +1797,7 @@
if (!default_dev) {
bt_shell_printf("No device connected\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
name = g_strdup(argv[1]);
@@ -1820,7 +1818,7 @@
if (!default_dev) {
bt_shell_printf("No device connected\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
proxy = gatt_select_attribute(default_attr, argv[1]);
@@ -1964,7 +1962,7 @@
dbus_bool_t enable;
if (!parse_argument(argc, argv, NULL, NULL, &enable, NULL))
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
if (!default_attr) {
bt_shell_printf("No attribute selected\n");
@@ -2150,7 +2148,7 @@
if (!parse_argument(argc, argv, ad_arguments, "type",
&enable, &type))
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
if (!default_ctrl || !default_ctrl->ad_proxy) {
bt_shell_printf("LEAdvertisingManager not found\n");
@@ -2193,7 +2191,7 @@
}
if (!parse_argument(argc, argv, NULL, NULL, &powered, NULL))
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
ad_advertise_tx_power(dbus_conn, &powered);
}
@@ -2350,7 +2348,8 @@
if (argc < 2 || !strlen(argv[1]))
all = true;
- data_clear(ad_clear, all ? "all" : argv[1]);
+ if(!data_clear(ad_clear, all ? "all" : argv[1]))
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
static const struct bt_shell_menu advertise_menu = {
