diff --git a/tools/obexctl.c b/tools/obexctl.c
index b633384..c62ae87 100644
--- a/tools/obexctl.c
+++ b/tools/obexctl.c
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to connect: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Connection successful\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void append_variant(DBusMessageIter *iter, int type, void *val)
if (!client) {
bt_shell_printf("Client proxy not available\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
if (argc > 2)
if (g_dbus_proxy_method_call(client, "CreateSession", connect_setup,
connect_reply, args, connect_args_free) == FALSE) {
bt_shell_printf("Failed to connect\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to connect to %s\n", argv[1]);
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to disconnect: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Disconnection successful\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void disconnect_setup(DBusMessageIter *iter, void *user_data)
if (proxy == NULL) {
bt_shell_printf("Session not available\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
if (g_dbus_proxy_method_call(client, "RemoveSession", disconnect_setup,
disconnect_reply, proxy, NULL) == FALSE) {
bt_shell_printf("Failed to disconnect\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to disconnect to %s\n",
GDBusProxy *proxy = l->data;
print_proxy(proxy, "Session", NULL);
}
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static bool check_default_session(void)
if (argc < 2) {
if (check_default_session() == FALSE)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
proxy = default_session;
} else {
OBEX_SESSION_INTERFACE);
if (!proxy) {
bt_shell_printf("Session %s not available\n", argv[1]);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
}
print_property(proxy, "Destination");
print_property(proxy, "Target");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void set_default_session(GDBusProxy *proxy)
OBEX_SESSION_INTERFACE);
if (proxy == NULL) {
bt_shell_printf("Session %s not available\n", argv[1]);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
if (default_session == proxy)
- return;
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
set_default_session(proxy);
print_proxy(proxy, "Session", NULL);
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void transfer_info(GDBusProxy *proxy, int argc, char *argv[])
OBEX_TRANSFER_INTERFACE);
if (proxy) {
transfer_info(proxy, argc, argv);
- return;
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
proxy = g_dbus_proxy_lookup(msgs, NULL, argv[1], OBEX_MSG_INTERFACE);
if (proxy) {
message_info(proxy, argc, argv);
- return;
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
bt_shell_printf("Object %s not available\n", argv[1]);
+
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
static void cancel_reply(DBusMessage *message, void *user_data)
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to cancel: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Cancel successful\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void cmd_cancel(int argc, char *argv[])
OBEX_TRANSFER_INTERFACE);
if (!proxy) {
bt_shell_printf("Transfer %s not available\n", argv[1]);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
if (g_dbus_proxy_method_call(proxy, "Cancel", NULL, cancel_reply, NULL,
NULL) == FALSE) {
bt_shell_printf("Failed to cancel transfer\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to cancel transfer %s\n",
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to suspend: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Suspend successful\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void cmd_suspend(int argc, char *argv[])
OBEX_TRANSFER_INTERFACE);
if (!proxy) {
bt_shell_printf("Transfer %s not available\n", argv[1]);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
if (g_dbus_proxy_method_call(proxy, "Suspend", NULL, suspend_reply,
NULL, NULL) == FALSE) {
bt_shell_printf("Failed to suspend transfer\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to suspend transfer %s\n",
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to resume: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Resume successful\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void cmd_resume(int argc, char *argv[])
OBEX_TRANSFER_INTERFACE);
if (!proxy) {
bt_shell_printf("Transfer %s not available\n", argv[1]);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
if (g_dbus_proxy_method_call(proxy, "Resume", NULL, resume_reply,
NULL, NULL) == FALSE) {
bt_shell_printf("Failed to resume transfer\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to resume transfer %s\n",
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to send/pull: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
dbus_message_iter_init(message, &iter);
print_transfer_iter(&iter);
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void send_setup(DBusMessageIter *iter, void *user_data)
if (g_dbus_proxy_method_call(proxy, "SendFile", send_setup, send_reply,
g_strdup(argv[1]), g_free) == FALSE) {
bt_shell_printf("Failed to send\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to send %s to %s\n", argv[1],
if (g_dbus_proxy_method_call(proxy, "PullBusinessCard", send_setup,
send_reply, g_strdup(argv[1]), g_free) == FALSE) {
bt_shell_printf("Failed to pull\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to pull %s from %s\n", argv[1],
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to PushMessage: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
dbus_message_iter_init(message, &iter);
print_transfer_iter(&iter);
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void push_setup(DBusMessageIter *iter, void *user_data)
push_reply, g_strdup(argv[1]),
g_free) == FALSE) {
bt_shell_printf("Failed to send\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to send %s to %s\n", argv[1],
GDBusProxy *proxy;
if (!check_default_session())
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
proxy = g_dbus_proxy_lookup(opps, NULL, path, OBEX_OPP_INTERFACE);
if (proxy) {
}
bt_shell_printf("Command not supported\n");
+
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
static void cmd_pull(int argc, char *argv[])
GDBusProxy *proxy;
if (!check_default_session())
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
proxy = g_dbus_proxy_lookup(opps, NULL, path, OBEX_OPP_INTERFACE);
if (proxy) {
}
bt_shell_printf("Command not supported\n");
+
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
static void change_folder_reply(DBusMessage *message, void *user_data)
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to ChangeFolder: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("ChangeFolder successful\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void change_folder_setup(DBusMessageIter *iter, void *user_data)
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to Select: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
dbus_message_iter_init(message, &iter);
bt_shell_printf("Select successful\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void select_setup(DBusMessageIter *iter, void *user_data)
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to SetFolder: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("SetFolder successful\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void setfolder_setup(DBusMessageIter *iter, void *user_data)
change_folder_reply, g_strdup(argv[1]),
g_free) == FALSE) {
bt_shell_printf("Failed to ChangeFolder\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to ChangeFolder to %s\n", argv[1]);
select_reply, g_strdup(argv[1]),
g_free) == FALSE) {
bt_shell_printf("Failed to Select\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to Select to %s\n", argv[1]);
setfolder_reply, g_strdup(argv[1]),
g_free) == FALSE) {
bt_shell_printf("Failed to SetFolder\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to SetFolder to %s\n", argv[1]);
GDBusProxy *proxy;
if (!check_default_session())
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
proxy = g_dbus_proxy_lookup(ftps, NULL, path, OBEX_FTP_INTERFACE);
if (proxy) {
}
bt_shell_printf("Command not supported\n");
+
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
static void list_folder_reply(DBusMessage *message, void *user_data)
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to ListFolder: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
dbus_message_iter_init(message, &iter);
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY)
- return;
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
dbus_message_iter_recurse(&iter, &array);
print_dict_iter(&array);
dbus_message_iter_next(&array);
}
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void ftp_ls(GDBusProxy *proxy, int argc, char *argv[])
list_folder_reply, NULL,
NULL) == FALSE) {
bt_shell_printf("Failed to ls\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to ListFolder\n");
dbus_message_iter_init(message, &iter);
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
dbus_message_iter_recurse(&iter, &array);
print_iter("\t", vcard, &entry);
dbus_message_iter_next(&array);
}
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void list_reply(DBusMessage *message, void *user_data)
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to List: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
parse_list_reply(message);
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to Search: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
parse_list_reply(message);
search_reply, g_strdup(argv[1]),
g_free) == FALSE) {
bt_shell_printf("Failed to Search\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to Search\n");
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to ListFolders: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
dbus_message_iter_init(message, &iter);
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
dbus_message_iter_recurse(&iter, &array);
print_dict_iter(&array);
dbus_message_iter_next(&array);
}
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void list_folders_setup(DBusMessageIter *iter, void *user_data)
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to ListFolders: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
dbus_message_iter_init(message, &iter);
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY)
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
dbus_message_iter_recurse(&iter, &array);
bt_shell_printf("\t%s\n", obj);
dbus_message_iter_next(&array);
}
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void list_messages_setup(DBusMessageIter *iter, void *user_data)
if (g_dbus_proxy_method_call(proxy, "List", list_setup, list_reply,
NULL, NULL) == FALSE) {
bt_shell_printf("Failed to List\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to List\n");
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to GetSize: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
dbus_message_iter_init(message, &iter);
print_iter("\t", "Size", &iter);
pbap_list(proxy, 0, NULL);
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void pbap_get_size(GDBusProxy *proxy, int argc, char *argv[])
if (g_dbus_proxy_method_call(proxy, "GetSize", NULL, get_size_reply,
proxy, NULL) == FALSE) {
bt_shell_printf("Failed to GetSize\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to GetSize\n");
list_messages_reply, g_strdup(argv[1]),
g_free) == FALSE) {
bt_shell_printf("Failed to ListMessages\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to ListMessages\n");
list_folders_reply, NULL,
NULL) == FALSE) {
bt_shell_printf("Failed to ListFolders\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to ListFolders\n");
}
bt_shell_printf("Command not supported\n");
+
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
struct cp_args {
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to CopyFile: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("CopyFile successful\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void ftp_copy(GDBusProxy *proxy, int argc, char *argv[])
if (g_dbus_proxy_method_call(proxy, "CopyFile", cp_setup,
copy_file_reply, args, cp_free) == FALSE) {
bt_shell_printf("Failed to CopyFile\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to CopyFile\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void get_file_reply(DBusMessage *message, void *user_data)
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to GetFile: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
dbus_message_iter_init(message, &iter);
print_transfer_iter(&iter);
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void get_file_setup(DBusMessageIter *iter, void *user_data)
if (g_dbus_proxy_method_call(proxy, "GetFile", get_file_setup,
get_file_reply, args, cp_free) == FALSE) {
bt_shell_printf("Failed to GetFile\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to GetFile\n");
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to PutFile: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
dbus_message_iter_init(message, &iter);
print_transfer_iter(&iter);
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void ftp_put(GDBusProxy *proxy, int argc, char *argv[])
if (rindex(argv[2], ':') != NULL) {
bt_shell_printf("Invalid target file argument\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
args = cp_new(argv);
if (g_dbus_proxy_method_call(proxy, "PutFile", cp_setup, put_file_reply,
args, cp_free) == FALSE) {
bt_shell_printf("Failed to PutFile\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to PutFile\n");
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to PullAll: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
pull_all_reply, g_strdup(argv[2]),
g_free) == FALSE) {
bt_shell_printf("Failed to PullAll\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to PullAll\n");
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to Pull: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
if (g_dbus_proxy_method_call(proxy, "Pull", pull_setup, pull_reply,
args, cp_free) == FALSE) {
bt_shell_printf("Failed to Pull\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to Pull\n");
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to Get: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
dbus_message_iter_init(message, &iter);
print_transfer_iter(&iter);
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void get_setup(DBusMessageIter *iter, void *user_data)
obj = g_dbus_proxy_lookup(msgs, NULL, argv[1], OBEX_MSG_INTERFACE);
if (obj == NULL) {
bt_shell_printf("Invalid message argument\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
if (g_dbus_proxy_method_call(obj, "Get", get_setup, get_reply,
g_strdup(argv[2]), g_free) == FALSE) {
bt_shell_printf("Failed to Get\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to Get\n");
GDBusProxy *proxy;
if (!check_default_session())
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
proxy = g_dbus_proxy_lookup(ftps, NULL, path, OBEX_FTP_INTERFACE);
if (proxy) {
}
bt_shell_printf("Command not supported\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void move_file_reply(DBusMessage *message, void *user_data)
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to MoveFile: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("MoveFile successful\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void cmd_mv(int argc, char *argv[])
struct cp_args *args;
if (!check_default_session())
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
proxy = g_dbus_proxy_lookup(ftps, NULL, path, OBEX_FTP_INTERFACE);
if (proxy == NULL) {
bt_shell_printf("Command not supported\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
args = cp_new(argv);
if (g_dbus_proxy_method_call(proxy, "MoveFile", cp_setup,
move_file_reply, args, cp_free) == FALSE) {
bt_shell_printf("Failed to MoveFile\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to MoveFile\n");
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to Delete: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Delete successful\n");
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
static void delete_setup(DBusMessageIter *iter, void *user_data)
delete_reply, g_strdup(argv[1]),
g_free) == FALSE) {
bt_shell_printf("Failed to Delete\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to Delete\n");
static void set_delete_reply(const DBusError *error, void *user_data)
{
- if (dbus_error_is_set(error))
+ if (dbus_error_is_set(error)) {
bt_shell_printf("Failed to set Deleted: %s\n", error->name);
- else
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ } else {
bt_shell_printf("Set Deleted successful\n");
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+ }
}
static void map_rm(GDBusProxy *proxy, int argc, char *argv[])
msg = g_dbus_proxy_lookup(msgs, NULL, argv[1], OBEX_MSG_INTERFACE);
if (msg == NULL) {
bt_shell_printf("Invalid message argument\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
if (g_dbus_proxy_set_property_basic(msg, "Deleted", DBUS_TYPE_BOOLEAN,
&value, set_delete_reply,
NULL, NULL) == FALSE) {
bt_shell_printf("Failed to set Deleted\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to set Deleted\n");
GDBusProxy *proxy;
if (!check_default_session())
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
proxy = g_dbus_proxy_lookup(ftps, NULL, path, OBEX_FTP_INTERFACE);
if (proxy) {
}
bt_shell_printf("Command not supported\n");
+
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
static void create_folder_reply(DBusMessage *message, void *user_data)
if (dbus_set_error_from_message(&error, message) == TRUE) {
bt_shell_printf("Failed to CreateFolder: %s\n", error.name);
dbus_error_free(&error);
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("CreateFolder successful\n");
GDBusProxy *proxy;
if (!check_default_session())
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
proxy = g_dbus_proxy_lookup(ftps, NULL, path, OBEX_FTP_INTERFACE);
if (proxy == NULL) {
bt_shell_printf("Command not supported\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
if (g_dbus_proxy_method_call(proxy, "CreateFolder", create_folder_setup,
create_folder_reply, g_strdup(argv[1]),
g_free) == FALSE) {
bt_shell_printf("Failed to CreateFolder\n");
- return;
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
bt_shell_printf("Attempting to CreateFolder\n");