bus: add new sd_bus_creds object to encapsulate process credentials

[elogind.git] / src / shared / unit-name.c

diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
index 8f6c28e86a84f6ea1fbcc9f6661e98952fa005c7..2335463777e7a1c2a1e09e6e6daa0020882cbfc3 100644 (file)
--- a/src/shared/unit-name.c
+++ b/src/shared/unit-name.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <assert.h>
 
+#include "sd-bus.h"
 #include "path-util.h"
 #include "util.h"
 #include "unit-name.h"
@@ -301,7 +302,7 @@ char *unit_name_path_escape(const char *f) {
 
         path_kill_slashes(p);
 
-        if (streq(p, "/")) {
+        if (streq(p, "/") || streq(p, "")) {
                 free(p);
                 return strdup("-");
         }
@@ -459,7 +460,7 @@ char *unit_dbus_path_from_name(const char *name) {
 
         assert(name);
 
-        e = bus_path_escape(name);
+        e = sd_bus_label_escape(name);
         if (!e)
                 return NULL;
 
@@ -474,7 +475,7 @@ int unit_name_from_dbus_path(const char *path, char **name) {
         if (!e)
                 return -EINVAL;
 
-        n = bus_path_unescape(e);
+        n = sd_bus_label_unescape(e);
         if (!n)
                 return -ENOMEM;