X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Fsd-login.c;h=887c4210098f2bae00a47ee8487d896d8820f419;hb=1c0f62e37b0e775df7cb6121bc6ae64d1d885d3b;hp=1d4368187f5f430de16a692f69279714aeccef84;hpb=9847946e12479b27d3ebfd024f00a6ac33ce73d3;p=elogind.git diff --git a/src/login/sd-login.c b/src/login/sd-login.c index 1d4368187..887c42100 100644 --- a/src/login/sd-login.c +++ b/src/login/sd-login.c @@ -121,11 +121,12 @@ _public_ int sd_pid_get_session(pid_t pid, char **session) { return 0; } -_public_ int sd_pid_get_service(pid_t pid, char **service) { +_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 (!service) + if (!unit) return -EINVAL; r = pid_get_cgroup(pid, NULL, &cgroup); @@ -138,13 +139,37 @@ _public_ int sd_pid_get_service(pid_t pid, char **service) { } 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; - *service = p; + *unit = b; return 0; } @@ -329,17 +354,40 @@ _public_ int sd_uid_get_seats(uid_t uid, int require_active, char ***seats) { return uid_get_array(uid, require_active ? "ACTIVE_SEATS" : "SEATS", seats); } -_public_ int sd_session_is_active(const char *session) { +static int file_of_session(const char *session, char **_p) { + char *p; int r; - char *p, *s = NULL; - if (!session) - return -EINVAL; + assert(_p); + + if (session) + p = strappend("/run/systemd/sessions/", session); + else { + char *buf; + + r = sd_pid_get_session(0, &buf); + if (r < 0) + return r; + + p = strappend("/run/systemd/sessions/", buf); + free(buf); + } - p = strappend("/run/systemd/sessions/", session); if (!p) return -ENOMEM; + *_p = p; + return 0; +} + +_public_ int sd_session_is_active(const char *session) { + int r; + char *p, *s = NULL; + + r = file_of_session(session, &p); + if (r < 0) + return r; + r = parse_env_file(p, NEWLINE, "ACTIVE", &s, NULL); free(p); @@ -361,14 +409,12 @@ _public_ int sd_session_get_uid(const char *session, uid_t *uid) { int r; char *p, *s = NULL; - if (!session) - return -EINVAL; if (!uid) return -EINVAL; - p = strappend("/run/systemd/sessions/", session); - if (!p) - return -ENOMEM; + r = file_of_session(session, &p); + if (r < 0) + return r; r = parse_env_file(p, NEWLINE, "UID", &s, NULL); free(p); @@ -387,20 +433,18 @@ _public_ int sd_session_get_uid(const char *session, uid_t *uid) { return r; } -_public_ int sd_session_get_seat(const char *session, char **seat) { +static int session_get_string(const char *session, const char *field, char **value) { char *p, *s = NULL; int r; - if (!session) - return -EINVAL; - if (!seat) + if (!value) return -EINVAL; - p = strappend("/run/systemd/sessions/", session); - if (!p) - return -ENOMEM; + r = file_of_session(session, &p); + if (r < 0) + return r; - r = parse_env_file(p, NEWLINE, "SEAT", &s, NULL); + r = parse_env_file(p, NEWLINE, field, &s, NULL); free(p); if (r < 0) { @@ -411,7 +455,53 @@ _public_ int sd_session_get_seat(const char *session, char **seat) { if (isempty(s)) return -ENOENT; - *seat = s; + *value = s; + return 0; +} + +_public_ int sd_session_get_seat(const char *session, char **seat) { + return session_get_string(session, "SEAT", seat); +} + +_public_ int sd_session_get_service(const char *session, char **service) { + return session_get_string(session, "SERVICE", service); +} + +_public_ int sd_session_get_type(const char *session, char **type) { + return session_get_string(session, "TYPE", type); +} + +_public_ int sd_session_get_class(const char *session, char **class) { + return session_get_string(session, "CLASS", class); +} + +_public_ int sd_session_get_display(const char *session, char **display) { + return session_get_string(session, "DISPLAY", display); +} + +static int file_of_seat(const char *seat, char **_p) { + char *p; + int r; + + assert(_p); + + if (seat) + p = strappend("/run/systemd/seats/", seat); + else { + char *buf; + + r = sd_session_get_seat(NULL, &buf); + if (r < 0) + return r; + + p = strappend("/run/systemd/seats/", buf); + free(buf); + } + + if (!p) + return -ENOMEM; + + *_p = p; return 0; } @@ -419,14 +509,12 @@ _public_ int sd_seat_get_active(const char *seat, char **session, uid_t *uid) { char *p, *s = NULL, *t = NULL; int r; - if (!seat) - return -EINVAL; if (!session && !uid) return -EINVAL; - p = strappend("/run/systemd/seats/", seat); - if (!p) - return -ENOMEM; + r = file_of_seat(seat, &p); + if (r < 0) + return r; r = parse_env_file(p, NEWLINE, "ACTIVE", &s, @@ -475,12 +563,9 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui unsigned n = 0; int r; - if (!seat) - return -EINVAL; - - p = strappend("/run/systemd/seats/", seat); - if (!p) - return -ENOMEM; + r = file_of_seat(seat, &p); + if (r < 0) + return r; r = parse_env_file(p, NEWLINE, "SESSIONS", &s, @@ -566,15 +651,12 @@ _public_ int sd_seat_can_multi_session(const char *seat) { char *p, *s = NULL; int r; - if (!seat) - return -EINVAL; - - p = strappend("/run/systemd/seats/", seat); - if (!p) - return -ENOMEM; + r = file_of_seat(seat, &p); + if (r < 0) + return r; r = parse_env_file(p, NEWLINE, - "IS_VTCONSOLE", &s, + "CAN_MULTI_SESSION", &s, NULL); free(p);