From: Adrian Szyndela <adrian.s@samsung.com>
Date: Thu, 5 Mar 2020 09:52:04 +0000 (+0100)
Subject: Revert (partial) "tree-wide: remove various unused functions"
X-Git-Tag: submit/tizen/20200402.112550^2~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b93f4fa06d342f89d4b5fb89578abb531ed2b9c;p=platform%2Fupstream%2Fsystemd.git

Revert (partial) "tree-wide: remove various unused functions"

This partially reverts commit 5dd9527883e0aa8705cf81448bc4bdb0456382fb.

bus_get_root_path() and sd_bus.cgroup_root are brought back.

Change-Id: Iad7b25472b3d877b1610b37e5473d9213fd661fc
---

diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index a14e264..10bf7fc 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -323,6 +323,8 @@ struct sd_bus {
         struct kdbus_pids fake_pids;
         char *fake_label;
 
+        char *cgroup_root;
+
         char *description;
         char *patch_sender;
 
@@ -415,6 +417,8 @@ int bus_set_address_user(sd_bus *bus);
 int bus_set_address_system_remote(sd_bus *b, const char *host);
 int bus_set_address_system_machine(sd_bus *b, const char *machine);
 
+int bus_get_root_path(sd_bus *bus);
+
 int bus_maybe_reply_error(sd_bus_message *m, int r, sd_bus_error *error);
 
 #define bus_assert_return(expr, r, error)                               \
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 6a84060..ee2282f 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -200,6 +200,7 @@ static sd_bus* bus_free(sd_bus *b) {
         free(b->kernel);
         free(b->machine);
         free(b->fake_label);
+        free(b->cgroup_root);
         free(b->description);
         free(b->patch_sender);
 
@@ -4174,6 +4175,24 @@ _public_ int sd_bus_get_description(sd_bus *bus, const char **description) {
         return 0;
 }
 
+int bus_get_root_path(sd_bus *bus) {
+        int r;
+
+        if (bus->cgroup_root)
+                return 0;
+
+        r = cg_get_root_path(&bus->cgroup_root);
+        if (r == -ENOENT) {
+                bus->cgroup_root = strdup("/");
+                if (!bus->cgroup_root)
+                        return -ENOMEM;
+
+                r = 0;
+        }
+
+        return r;
+}
+
 _public_ int sd_bus_get_scope(sd_bus *bus, const char **scope) {
         int r;