← Back to branch summary

~bluetooth/bluez/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch

  • Committer: simon.busch at canonical
  • Date: 2015-08-14 10:04:55 UTC
  • Revision ID: simon.busch@canonical.com-20150814100455-2nfs8l8r3fuly8ws
Add current packaging bits from wily

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
 
1
From f7861d27fbcbc519f57d8496aa9486f487908821 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/5] obex: Use GLib helper function to manipulate paths
 
5
 
 
6
Instead of trying to do it by hand. This also makes sure that
 
7
relative paths aren't used by the agent.
 
8
---
 
9
 obexd/src/manager.c | 10 +++++-----
 
10
 1 file changed, 5 insertions(+), 5 deletions(-)
 
11
 
 
12
Index: bluez-5.33/obexd/src/manager.c
 
13
===================================================================
 
14
--- bluez-5.33.orig/obexd/src/manager.c
 
15
+++ bluez-5.33/obexd/src/manager.c
 
16
@@ -650,14 +650,14 @@ static void agent_reply(DBusPendingCall
 
17
                                DBUS_TYPE_STRING, &name,
 
18
                                DBUS_TYPE_INVALID)) {
 
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);
 
23
-               if (!slash) {
 
24
-                       agent->new_name = g_strdup(name);
 
25
+               if (is_relative) {
 
26
+                       agent->new_name = g_path_get_basename(name);
 
27
                        agent->new_folder = NULL;
 
28
                } else {
 
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);
 
33
                }
 
34
        }
 
35