summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-01-13 00:49:02 +0100
committerLennart Poettering <lennart@poettering.net>2012-01-13 00:49:02 +0100
commitebda471d898063887008ede9811ffbe1acbc38e5 (patch)
tree343abcd300c85d4807c4d12d66b9105a83261d03 /src
parent7c8bbccd071a9a12efdd8a7770b53d7786eb3a9c (diff)
sd-login: teach sd_pid_get_unit() proper handling of instantiated services
Diffstat (limited to 'src')
-rw-r--r--src/login/sd-login.c33
1 files changed, 29 insertions, 4 deletions
diff --git a/src/login/sd-login.c b/src/login/sd-login.c
index ed98412266..eb1a4b910a 100644
--- a/src/login/sd-login.c
+++ b/src/login/sd-login.c
@@ -123,7 +123,8 @@ _public_ int sd_pid_get_session(pid_t pid, char **session) {
_public_ int sd_pid_get_unit(pid_t pid, char **unit) {
int r;
- char *cgroup, *p;
+ char *cgroup, *p, *at, *b;
+ size_t k;
if (!unit)
return -EINVAL;
@@ -138,13 +139,37 @@ _public_ int sd_pid_get_unit(pid_t pid, char **unit) {
}
p = cgroup + 8;
- p = strndup(p, strcspn(p, "/"));
+ k = strcspn(p, "/");
+
+ at = memchr(p, '@', k);
+ if (at && at[1] == '.') {
+ size_t j;
+
+ /* This is a templated service */
+ if (p[k] != '/') {
+ free(cgroup);
+ return -EIO;
+ }
+
+ j = strcspn(p+k+1, "/");
+
+ b = malloc(k + j + 1);
+
+ if (b) {
+ memcpy(b, p, at - p + 1);
+ memcpy(b + (at - p) + 1, p + k + 1, j);
+ memcpy(b + (at - p) + 1 + j, at + 1, k - (at - p) - 1);
+ b[k+j] = 0;
+ }
+ } else
+ b = strndup(p, k);
+
free(cgroup);
- if (!p)
+ if (!b)
return -ENOMEM;
- *unit = p;
+ *unit = b;
return 0;
}