morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

uid-range: use parse_uid_range()

Browse Source
This commit is contained in:
Yu Watanabe
2022-09-16 10:23:43 +09:00
parent fb76e6a710
commit 7cf337c50f
1 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/basic/uid-range.c
View File

@@ -109,41 +109,18 @@ int uid_range_add(UidRange **p, size_t *n, uid_t start, uid_t nr) {
}
int uid_range_add_str(UidRange **p, size_t *n, const char *s) {
uid_t start, nr;
const char *t;
uid_t start, end;
int r;
assert(p);
assert(n);
assert(s);
t = strchr(s, '-');
if (t) {
char *b;
uid_t end;
r = parse_uid_range(s, &start, &end);
if (r < 0)
return r;
b = strndupa_safe(s, t - s);
r = parse_uid(b, &start);
if (r < 0)
return r;
r = parse_uid(t+1, &end);
if (r < 0)
return r;
if (end < start)
return -EINVAL;
nr = end - start + 1;
} else {
r = parse_uid(s, &start);
if (r < 0)
return r;
nr = 1;
}
return uid_range_add(p, n, start, nr);
return uid_range_add(p, n, start, end - start + 1);
}
int uid_range_next_lower(const UidRange *p, size_t n, uid_t *uid) {