}
static int file_of_uid(uid_t uid, char **p) {
-
- assert_return(uid_is_valid(uid), -EINVAL);
assert(p);
if (asprintf(p, "/run/systemd/users/" UID_FMT, uid) < 0)
if (!s)
return -ENOMEM;
- }
- if (r < 0) {
+ } else if (r < 0) {
free(s);
return r;
- }
- if (isempty(s)) {
- free(s);
+ } else if (!s)
return -EIO;
- }
*state = s;
return 0;
r = parse_env_file(p, NEWLINE, "DISPLAY", &s, NULL);
if (r == -ENOENT)
- return -ENODATA;
+ return -ENXIO;
if (r < 0)
return r;
+
if (isempty(s))
- return -ENODATA;
+ return -ENXIO;
*session = s;
s = NULL;
return 0;
}
-static int file_of_seat(const char *seat, char **_p) {
- char *p;
- int r;
-
- assert(_p);
-
- if (seat) {
- if (!filename_is_valid(seat))
- return -EINVAL;
-
- p = strappend("/run/systemd/seats/", seat);
- } else {
- _cleanup_free_ char *buf = NULL;
-
- r = sd_session_get_seat(NULL, &buf);
- if (r < 0)
- return r;
-
- p = strappend("/run/systemd/seats/", buf);
- }
-
- if (!p)
- return -ENOMEM;
-
- *_p = p;
- p = NULL;
- return 0;
-}
-
_public_ int sd_uid_is_on_seat(uid_t uid, int require_active, const char *seat) {
_cleanup_free_ char *t = NULL, *s = NULL, *p = NULL;
size_t l;
int r;
const char *word, *variable, *state;
- assert_return(uid_is_valid(uid), -EINVAL);
-
- r = file_of_seat(seat, &p);
- if (r < 0)
- return r;
+ assert_return(seat, -EINVAL);
variable = require_active ? "ACTIVE_UID" : "UIDS";
+ p = strappend("/run/systemd/seats/", seat);
+ if (!p)
+ return -ENOMEM;
+
r = parse_env_file(p, NEWLINE, variable, &s, NULL);
- if (r == -ENOENT)
- return 0;
+
if (r < 0)
return r;
- if (isempty(s))
- return 0;
+
+ if (!s)
+ return -EIO;
if (asprintf(&t, UID_FMT, uid) < 0)
return -ENOMEM;
- FOREACH_WORD(word, l, s, state)
+ FOREACH_WORD(word, l, s, state) {
if (strneq(t, word, l))
return 1;
+ }
return 0;
}
char **a;
int r;
- assert(variable);
-
r = file_of_uid(uid, &p);
if (r < 0)
return r;
- r = parse_env_file(p, NEWLINE, variable, &s, NULL);
- if (r == -ENOENT || (r >= 0 && isempty(s))) {
+ r = parse_env_file(p, NEWLINE,
+ variable, &s,
+ NULL);
+ if (r < 0) {
+ if (r == -ENOENT) {
+ if (array)
+ *array = NULL;
+ return 0;
+ }
+
+ return r;
+ }
+
+ if (!s) {
if (array)
*array = NULL;
return 0;
}
- if (r < 0)
- return r;
a = strv_split(s, " ");
+
if (!a)
return -ENOMEM;
}
_public_ int sd_session_is_active(const char *session) {
- _cleanup_free_ char *p = NULL, *s = NULL;
int r;
+ _cleanup_free_ char *p = NULL, *s = NULL;
r = file_of_session(session, &p);
if (r < 0)
return r;
r = parse_env_file(p, NEWLINE, "ACTIVE", &s, NULL);
- if (r == -ENOENT)
- return -ENXIO;
if (r < 0)
return r;
- if (isempty(s))
+
+ if (!s)
return -EIO;
return parse_boolean(s);
}
_public_ int sd_session_is_remote(const char *session) {
- _cleanup_free_ char *p = NULL, *s = NULL;
int r;
+ _cleanup_free_ char *p = NULL, *s = NULL;
r = file_of_session(session, &p);
if (r < 0)
return r;
r = parse_env_file(p, NEWLINE, "REMOTE", &s, NULL);
- if (r == -ENOENT)
- return -ENXIO;
if (r < 0)
return r;
- if (isempty(s))
- return -ENODATA;
+
+ if (!s)
+ return -EIO;
return parse_boolean(s);
}
return r;
r = parse_env_file(p, NEWLINE, "STATE", &s, NULL);
- if (r == -ENOENT)
- return -ENXIO;
if (r < 0)
return r;
- if (isempty(s))
+ else if (!s)
return -EIO;
*state = s;
return r;
r = parse_env_file(p, NEWLINE, "UID", &s, NULL);
- if (r == -ENOENT)
- return -ENXIO;
if (r < 0)
return r;
- if (isempty(s))
+
+ if (!s)
return -EIO;
return parse_uid(s, uid);
int r;
assert_return(value, -EINVAL);
- assert(field);
r = file_of_session(session, &p);
if (r < 0)
return r;
r = parse_env_file(p, NEWLINE, field, &s, NULL);
- if (r == -ENOENT)
- return -ENXIO;
if (r < 0)
return r;
+
if (isempty(s))
- return -ENODATA;
+ return -ENXIO;
*value = s;
s = NULL;
unsigned u;
int r;
- assert_return(vtnr, -EINVAL);
-
r = session_get_string(session, "VTNR", &vtnr_string);
if (r < 0)
return r;
return session_get_string(session, "REMOTE_HOST", remote_host);
}
+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 {
+ _cleanup_free_ char *buf = NULL;
+
+ r = sd_session_get_seat(NULL, &buf);
+ if (r < 0)
+ return r;
+
+ p = strappend("/run/systemd/seats/", buf);
+ }
+
+ if (!p)
+ return -ENOMEM;
+
+ *_p = p;
+ p = NULL;
+ return 0;
+}
+
_public_ int sd_seat_get_active(const char *seat, char **session, uid_t *uid) {
_cleanup_free_ char *p = NULL, *s = NULL, *t = NULL;
int r;
"ACTIVE", &s,
"ACTIVE_UID", &t,
NULL);
- if (r == -ENOENT)
- return -ENXIO;
if (r < 0)
return r;
if (session && !s)
- return -ENODATA;
+ return -ENOENT;
if (uid && !t)
- return -ENODATA;
+ return -ENOENT;
if (uid && t) {
r = parse_uid(t, uid);
"SESSIONS", &s,
"ACTIVE_SESSIONS", &t,
NULL);
- if (r == -ENOENT)
- return -ENXIO;
+
if (r < 0)
return r;
return -ENOMEM;
r = parse_uid(k, b + i);
+
if (r < 0)
continue;
_cleanup_free_ char *p = NULL, *s = NULL;
int r;
- assert(variable);
+ assert_return(variable, -EINVAL);
r = file_of_seat(seat, &p);
if (r < 0)
r = parse_env_file(p, NEWLINE,
variable, &s,
NULL);
- if (r == -ENOENT)
- return -ENXIO;
if (r < 0)
return r;
- if (isempty(s))
- return -ENODATA;
+ if (!s)
+ return 0;
return parse_boolean(s);
}
p = strjoina("/run/systemd/machines/", machine);
r = parse_env_file(p, NEWLINE, "CLASS", &c, NULL);
- if (r == -ENOENT)
- return -ENXIO;
if (r < 0)
return r;
if (!c)
p = strjoina("/run/systemd/machines/", machine);
r = parse_env_file(p, NEWLINE, "NETIF", &netif, NULL);
- if (r == -ENOENT)
- return -ENXIO;
if (r < 0)
return r;
if (!netif) {