shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-30 23:21:22 +03:00
Code

sd-device: use path_extract_directory() at one more place

Browse Source
This commit is contained in:
Yu Watanabe 2022-03-31 04:11:30 +09:00
parent becbcca5b8
commit 07c90f02d2
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libsystemd/sd-device/sd-device.c
View File

@ -735,7 +735,7 @@ _public_ int sd_device_get_syspath(sd_device *device, const char **ret) {
static int device_new_from_child(sd_device **ret, sd_device *child) {
_cleanup_free_ char *path = NULL;
const char *subdir, *syspath;
const char *syspath;
int r;
assert(ret);
@ -745,25 +745,21 @@ static int device_new_from_child(sd_device **ret, sd_device *child) {
if (r < 0)
return r;
path = strdup(syspath);
if (!path)
return -ENOMEM;
subdir = path + STRLEN("/sys");
for (;;) {
char *pos;
_cleanup_free_ char *p = NULL;
pos = strrchr(subdir, '/');
if (!pos || pos < subdir + 2)
r = path_extract_directory(path ?: syspath, &p);
if (r < 0)
return r;
if (path_equal(p, "/sys"))
return -ENODEV;
*pos = '\0';
r = sd_device_new_from_syspath(ret, p);
if (r != -ENODEV)
return r;
r = sd_device_new_from_syspath(ret, path);
if (r < 0)
continue;
return 0;
free_and_replace(path, p);
}
}