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