From: Sven Eden <yamakuzure@gmx.net>
Date: Wed, 5 Jul 2017 12:53:38 +0000 (+0200)
Subject: Prep v232.2: cg_shift_path() : With other controllers, elogind might end up in name... 
X-Git-Tag: v232.2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2a50d4724c0938a7a1af91556e0229263139ad54

Prep v232.2: cg_shift_path() : With other controllers, elogind might end up in name=foo:/elogind, where cgroup and root are both /elogind.
---

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 2c7ceb71d..44ab535cc 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1329,7 +1329,11 @@ int cg_shift_path(const char *cgroup, const char *root, const char **shifted) {
         }
 
         p = path_startswith(cgroup, root);
+#if 0 /// With other controllers, elogind might end up in /elogind, and *p is 0
         if (p && p > cgroup)
+#else
+        if (p && p[0] && (p > cgroup))
+#endif // 0
                 *shifted = p - 1;
         else
                 *shifted = cgroup;