picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

login/sd-login.c: make use of _cleanup_free_ and friends

Browse source
This commit is contained in:
Harald Hoyer 2013-04-17 14:05:24 +02:00
parent aea275c431
commit d70964d0f6
1 changed files with 61 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

200
src/login/sd-login.c
View file

@ -74,7 +74,7 @@ _public_ int sd_pid_get_machine_name(pid_t pid, char **name) {
_public_ int sd_pid_get_owner_uid(pid_t pid, uid_t *uid) { _public_ int sd_pid_get_owner_uid(pid_t pid, uid_t *uid) {
int r; int r;
char *root, *cgroup, *p, *cc; _cleanup_free_ char *root = NULL, *cgroup = NULL, *p = NULL, *cc = NULL;
struct stat st; struct stat st;
if (pid < 0) if (pid < 0)
@ -87,31 +87,23 @@ _public_ int sd_pid_get_owner_uid(pid_t pid, uid_t *uid) {
if (r < 0) if (r < 0)
return r; return r;
if (!startswith(cgroup, "/user/")) { if (!startswith(cgroup, "/user/"))
free(cgroup);
free(root);
return -ENOENT; return -ENOENT;
}
p = strchr(cgroup + 6, '/'); p = strchr(cgroup + 6, '/');
if (!p) { if (!p)
free(cgroup);
return -ENOENT; return -ENOENT;
}
p++; p++;
p += strcspn(p, "/"); p += strcspn(p, "/");
*p = 0; *p = 0;
r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, root, cgroup, &cc); r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, root, cgroup, &cc);
free(root);
free(cgroup);
if (r < 0) if (r < 0)
return -ENOMEM; return -ENOMEM;
r = lstat(cc, &st); r = lstat(cc, &st);
free(cc);
if (r < 0) if (r < 0)
return -errno; return -errno;
@ -155,7 +147,8 @@ _public_ int sd_uid_get_state(uid_t uid, char**state) {
} }
_public_ int sd_uid_is_on_seat(uid_t uid, int require_active, const char *seat) { _public_ int sd_uid_is_on_seat(uid_t uid, int require_active, const char *seat) {
char *p, *w, *t, *state, *s = NULL; char *w, *state;
_cleanup_free_ char *t = NULL, *s = NULL, *p = NULL;
size_t l; size_t l;
int r; int r;
const char *variable; const char *variable;
@ -170,38 +163,26 @@ _public_ int sd_uid_is_on_seat(uid_t uid, int require_active, const char *seat)
return -ENOMEM; return -ENOMEM;
r = parse_env_file(p, NEWLINE, variable, &s, NULL); r = parse_env_file(p, NEWLINE, variable, &s, NULL);
free(p);
if (r < 0) { if (r < 0)
free(s);
return r; return r;
}
if (!s) if (!s)
return -EIO; return -EIO;
if (asprintf(&t, "%lu", (unsigned long) uid) < 0) { if (asprintf(&t, "%lu", (unsigned long) uid) < 0)
free(s);
return -ENOMEM; return -ENOMEM;
}
FOREACH_WORD(w, l, s, state) { FOREACH_WORD(w, l, s, state) {
if (strneq(t, w, l)) { if (strneq(t, w, l))
free(s);
free(t);
return 1; return 1;
}
} }
free(s);
free(t);
return 0; return 0;
} }
static int uid_get_array(uid_t uid, const char *variable, char ***array) { static int uid_get_array(uid_t uid, const char *variable, char ***array) {
char *p, *s = NULL; _cleanup_free_ char *p = NULL, *s = NULL;
char **a; char **a;
int r; int r;
@ -211,11 +192,7 @@ static int uid_get_array(uid_t uid, const char *variable, char ***array) {
r = parse_env_file(p, NEWLINE, r = parse_env_file(p, NEWLINE,
variable, &s, variable, &s,
NULL); NULL);
free(p);
if (r < 0) { if (r < 0) {
free(s);
if (r == -ENOENT) { if (r == -ENOENT) {
if (array) if (array)
*array = NULL; *array = NULL;
@ -232,7 +209,6 @@ static int uid_get_array(uid_t uid, const char *variable, char ***array) {
} }
a = strv_split(s, " "); a = strv_split(s, " ");
free(s);
if (!a) if (!a)
return -ENOMEM; return -ENOMEM;
@ -294,31 +270,27 @@ static int file_of_session(const char *session, char **_p) {
_public_ int sd_session_is_active(const char *session) { _public_ int sd_session_is_active(const char *session) {
int r; int r;
char *p, *s = NULL; _cleanup_free_ char *p = NULL, *s = NULL;
r = file_of_session(session, &p); r = file_of_session(session, &p);
if (r < 0) if (r < 0)
return r; return r;
r = parse_env_file(p, NEWLINE, "ACTIVE", &s, NULL); r = parse_env_file(p, NEWLINE, "ACTIVE", &s, NULL);
free(p);
if (r < 0) { if (r < 0)
free(s);
return r; return r;
}
if (!s) if (!s)
return -EIO; return -EIO;
r = parse_boolean(s); r = parse_boolean(s);
free(s);
return r; return r;
} }
_public_ int sd_session_get_state(const char *session, char **state) { _public_ int sd_session_get_state(const char *session, char **state) {
char *p, *s = NULL; _cleanup_free_ char *p = NULL, *s = NULL;
int r; int r;
if (!state) if (!state)
@ -329,21 +301,21 @@ _public_ int sd_session_get_state(const char *session, char **state) {
return r; return r;
r = parse_env_file(p, NEWLINE, "STATE", &s, NULL); r = parse_env_file(p, NEWLINE, "STATE", &s, NULL);
free(p);
if (r < 0) { if (r < 0)
free(s);
return r; return r;
} else if (!s) else if (!s)
return -EIO; return -EIO;
*state = s; *state = s;
s = NULL;
return 0; return 0;
} }
_public_ int sd_session_get_uid(const char *session, uid_t *uid) { _public_ int sd_session_get_uid(const char *session, uid_t *uid) {
int r; int r;
char *p, *s = NULL; _cleanup_free_ char *p = NULL, *s = NULL;
if (!uid) if (!uid)
return -EINVAL; return -EINVAL;
@ -353,24 +325,20 @@ _public_ int sd_session_get_uid(const char *session, uid_t *uid) {
return r; return r;
r = parse_env_file(p, NEWLINE, "UID", &s, NULL); r = parse_env_file(p, NEWLINE, "UID", &s, NULL);
free(p);
if (r < 0) { if (r < 0)
free(s);
return r; return r;
}
if (!s) if (!s)
return -EIO; return -EIO;
r = parse_uid(s, uid); r = parse_uid(s, uid);
free(s);
return r; return r;
} }
static int session_get_string(const char *session, const char *field, char **value) { static int session_get_string(const char *session, const char *field, char **value) {
char *p, *s = NULL; _cleanup_free_ char *p = NULL, *s = NULL;
int r; int r;
if (!value) if (!value)
@ -381,17 +349,15 @@ static int session_get_string(const char *session, const char *field, char **val
return r; return r;
r = parse_env_file(p, NEWLINE, field, &s, NULL); r = parse_env_file(p, NEWLINE, field, &s, NULL);
free(p);
if (r < 0) { if (r < 0)
free(s);
return r; return r;
}
if (isempty(s)) if (isempty(s))
return -ENOENT; return -ENOENT;
*value = s; *value = s;
s = NULL;
return 0; return 0;
} }
@ -428,25 +394,25 @@ static int file_of_seat(const char *seat, char **_p) {
if (seat) if (seat)
p = strappend("/run/systemd/seats/", seat); p = strappend("/run/systemd/seats/", seat);
else { else {
char *buf; _cleanup_free_ char *buf = NULL;
r = sd_session_get_seat(NULL, &buf); r = sd_session_get_seat(NULL, &buf);
if (r < 0) if (r < 0)
return r; return r;
p = strappend("/run/systemd/seats/", buf); p = strappend("/run/systemd/seats/", buf);
free(buf);
} }
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
*_p = p; *_p = p;
p = NULL;
return 0; return 0;
} }
_public_ int sd_seat_get_active(const char *seat, char **session, uid_t *uid) { _public_ int sd_seat_get_active(const char *seat, char **session, uid_t *uid) {
char *p, *s = NULL, *t = NULL; _cleanup_free_ char *p = NULL, *s = NULL, *t = NULL;
int r; int r;
if (!session && !uid) if (!session && !uid)
@ -460,46 +426,33 @@ _public_ int sd_seat_get_active(const char *seat, char **session, uid_t *uid) {
"ACTIVE", &s, "ACTIVE", &s,
"ACTIVE_UID", &t, "ACTIVE_UID", &t,
NULL); NULL);
free(p); if (r < 0)
if (r < 0) {
free(s);
free(t);
return r; return r;
}
if (session && !s) { if (session && !s)
free(t);
return -ENOENT; return -ENOENT;
}
if (uid && !t) { if (uid && !t)
free(s);
return -ENOENT; return -ENOENT;
}
if (uid && t) { if (uid && t) {
r = parse_uid(t, uid); r = parse_uid(t, uid);
if (r < 0) { if (r < 0)
free(t);
free(s);
return r; return r;
}
} }
free(t); if (session && s) {
if (session && s)
*session = s; *session = s;
else s = NULL;
free(s); }
return 0; return 0;
} }
_public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **uids, unsigned *n_uids) { _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **uids, unsigned *n_uids) {
char *p, *s = NULL, *t = NULL, **a = NULL; _cleanup_free_ char *p = NULL, *s = NULL, *t = NULL;
uid_t *b = NULL; _cleanup_strv_free_ char **a = NULL;
_cleanup_free_ uid_t *b = NULL;
unsigned n = 0; unsigned n = 0;
int r; int r;
@ -511,25 +464,16 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui
"SESSIONS", &s, "SESSIONS", &s,
"ACTIVE_SESSIONS", &t, "ACTIVE_SESSIONS", &t,
NULL); NULL);
free(p);
if (r < 0) { if (r < 0)
free(s);
free(t);
return r; return r;
}
if (s) { if (s) {
a = strv_split(s, " "); a = strv_split(s, " ");
if (!a) { if (!a)
free(s);
free(t);
return -ENOMEM; return -ENOMEM;
}
} }
free(s);
if (uids && t) { if (uids && t) {
char *w, *state; char *w, *state;
size_t l; size_t l;
@ -537,30 +481,22 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui
FOREACH_WORD(w, l, t, state) FOREACH_WORD(w, l, t, state)
n++; n++;
if (n == 0) if (n > 0) {
b = NULL;
else {
unsigned i = 0; unsigned i = 0;
b = new(uid_t, n); b = new(uid_t, n);
if (!b) { if (!b)
strv_free(a);
return -ENOMEM; return -ENOMEM;
}
FOREACH_WORD(w, l, t, state) { FOREACH_WORD(w, l, t, state) {
char *k; _cleanup_free_ char *k = NULL;
k = strndup(w, l); k = strndup(w, l);
if (!k) { if (!k)
free(t);
free(b);
strv_free(a);
return -ENOMEM; return -ENOMEM;
}
r = parse_uid(k, b + i); r = parse_uid(k, b + i);
free(k);
if (r < 0) if (r < 0)
continue; continue;
@ -569,17 +505,17 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui
} }
} }
free(t);
r = strv_length(a); r = strv_length(a);
if (sessions) if (sessions) {
*sessions = a; *sessions = a;
else a = NULL;
strv_free(a); }
if (uids) if (uids) {
*uids = b; *uids = b;
b = NULL;
}
if (n_uids) if (n_uids)
*n_uids = n; *n_uids = n;
@ -588,7 +524,7 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui
} }
static int seat_get_can(const char *seat, const char *variable) { static int seat_get_can(const char *seat, const char *variable) {
char *p, *s = NULL; _cleanup_free_ char *p = NULL, *s = NULL;
int r; int r;
r = file_of_seat(seat, &p); r = file_of_seat(seat, &p);
@ -598,17 +534,12 @@ static int seat_get_can(const char *seat, const char *variable) {
r = parse_env_file(p, NEWLINE, r = parse_env_file(p, NEWLINE,
variable, &s, variable, &s,
NULL); NULL);
free(p); if (r < 0)
if (r < 0) {
free(s);
return r; return r;
}
if (s) { if (s)
r = parse_boolean(s); r = parse_boolean(s);
free(s); else
} else
r = 0; r = 0;
return r; return r;
@ -635,10 +566,10 @@ _public_ int sd_get_sessions(char ***sessions) {
} }
_public_ int sd_get_uids(uid_t **users) { _public_ int sd_get_uids(uid_t **users) {
DIR *d; _cleanup_closedir_ DIR *d;
int r = 0; int r = 0;
unsigned n = 0; unsigned n = 0;
uid_t *l = NULL; _cleanup_free_ uid_t *l = NULL;
d = opendir("/run/systemd/users/"); d = opendir("/run/systemd/users/");
if (!d) if (!d)
@ -651,10 +582,8 @@ _public_ int sd_get_uids(uid_t **users) {
uid_t uid; uid_t uid;
k = readdir_r(d, &buf.de, &de); k = readdir_r(d, &buf.de, &de);
if (k != 0) { if (k != 0)
r = -k; return -k;
goto finish;
}
if (!de) if (!de)
break; break;
@ -674,10 +603,8 @@ _public_ int sd_get_uids(uid_t **users) {
n = MAX(16, 2*r); n = MAX(16, 2*r);
t = realloc(l, sizeof(uid_t) * n); t = realloc(l, sizeof(uid_t) * n);
if (!t) { if (!t)
r = -ENOMEM; return -ENOMEM;
goto finish;
}
l = t; l = t;
} }
@ -688,15 +615,10 @@ _public_ int sd_get_uids(uid_t **users) {
r++; r++;
} }
finish: if (users) {
if (d) *users = l;
closedir(d); l = NULL;
}
if (r >= 0) {
if (users)
*users = l;
} else
free(l);
return r; return r;
} }