From f01de9656d0969633ac89eb57a0ba4658a100568 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Sun, 23 Feb 2014 00:46:26 +0100
Subject: src/shared/ cannot reference symbols from libraries

../src/shared/unit-name.c:462: error: undefined reference to 'sd_bus_label_escape'
../src/shared/unit-name.c:477: error: undefined reference to 'sd_bus_label_unescape'
collect2: error: ld returned 1 exit status
---
 src/libsystemd/sd-bus/sd-bus.c | 69 ++----------------------------------------
 1 file changed, 3 insertions(+), 66 deletions(-)

(limited to 'src/libsystemd')

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 427d53061c..20f540df58 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -36,6 +36,7 @@
 #include "missing.h"
 #include "def.h"
 #include "cgroup-util.h"
+#include "bus-label.h"
 
 #include "sd-bus.h"
 #include "bus-internal.h"
@@ -3041,75 +3042,11 @@ _public_ int sd_bus_get_tid(sd_bus *b, pid_t *tid) {
 }
 
 _public_ char *sd_bus_label_escape(const char *s) {
-        char *r, *t;
-        const char *f;
-
-        assert_return(s, NULL);
-
-        /* Escapes all chars that D-Bus' object path cannot deal
-         * with. Can be reversed with bus_path_unescape(). We special
-         * case the empty string. */
-
-        if (*s == 0)
-                return strdup("_");
-
-        r = new(char, strlen(s)*3 + 1);
-        if (!r)
-                return NULL;
-
-        for (f = s, t = r; *f; f++) {
-
-                /* Escape everything that is not a-zA-Z0-9. We also
-                 * escape 0-9 if it's the first character */
-
-                if (!(*f >= 'A' && *f <= 'Z') &&
-                    !(*f >= 'a' && *f <= 'z') &&
-                    !(f > s && *f >= '0' && *f <= '9')) {
-                        *(t++) = '_';
-                        *(t++) = hexchar(*f >> 4);
-                        *(t++) = hexchar(*f);
-                } else
-                        *(t++) = *f;
-        }
-
-        *t = 0;
-
-        return r;
+        return bus_label_escape(s);
 }
 
 _public_ char *sd_bus_label_unescape(const char *f) {
-        char *r, *t;
-
-        assert_return(f, NULL);
-
-        /* Special case for the empty string */
-        if (streq(f, "_"))
-                return strdup("");
-
-        r = new(char, strlen(f) + 1);
-        if (!r)
-                return NULL;
-
-        for (t = r; *f; f++) {
-
-                if (*f == '_') {
-                        int a, b;
-
-                        if ((a = unhexchar(f[1])) < 0 ||
-                            (b = unhexchar(f[2])) < 0) {
-                                /* Invalid escape code, let's take it literal then */
-                                *(t++) = '_';
-                        } else {
-                                *(t++) = (char) ((a << 4) | b);
-                                f += 2;
-                        }
-                } else
-                        *(t++) = *f;
-        }
-
-        *t = 0;
-
-        return r;
+        return bus_label_unescape(f);
 }
 
 _public_ int sd_bus_get_peer_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **ret) {
-- 
cgit v1.2.3-54-g00ecf