123456789101112131415161718192021222324252627282930313233343536373839 |
- From 90b72b787a6ae6b9b0bf8ece238e108e8607a433 Mon Sep 17 00:00:00 2001
- From: Bastien Nocera <hadess@hadess.net>
- Date: Sat, 9 Nov 2013 18:13:43 +0100
- Subject: [PATCH 1/2] obex: Use GLib helper function to manipulate paths
- Instead of trying to do it by hand. This also makes sure that
- relative paths aren't used by the agent.
- ---
- obexd/src/manager.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
- diff --git a/obexd/src/manager.c b/obexd/src/manager.c
- index f84384ae4..285c07c37 100644
- --- a/obexd/src/manager.c
- +++ b/obexd/src/manager.c
- @@ -650,14 +650,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data)
- DBUS_TYPE_STRING, &name,
- DBUS_TYPE_INVALID)) {
- /* Splits folder and name */
- - const char *slash = strrchr(name, '/');
- + gboolean is_relative = !g_path_is_absolute(name);
- DBG("Agent replied with %s", name);
- - if (!slash) {
- - agent->new_name = g_strdup(name);
- + if (is_relative) {
- + agent->new_name = g_path_get_basename(name);
- agent->new_folder = NULL;
- } else {
- - agent->new_name = g_strdup(slash + 1);
- - agent->new_folder = g_strndup(name, slash - name);
- + agent->new_name = g_path_get_basename(name);
- + agent->new_folder = g_path_get_dirname(name);
- }
- }
-
- --
- 2.14.1
|