shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-10 01:17:44 +03:00
Code

Merge pull request #23337 from yuwata/sd-device-new-from-subsystem-sysname

Browse Source 
sd-device: always translate sysname to sysfs filename
This commit is contained in:
Luca Boccassi 2022-05-13 00:10:24 +01:00 committed by GitHub
commit 7eeedcfcb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,17 +414,21 @@ _public_ int sd_device_new_from_subsystem_sysname(
assert_return(path_is_normalized(subsystem), -EINVAL);
assert_return(path_is_normalized(sysname), -EINVAL);
/* translate sysname back to sysfs filename */
name = strdupa_safe(sysname);
string_replace_char(name, '/', '!');
if (streq(subsystem, "subsystem")) {
FOREACH_STRING(s, "/sys/bus/", "/sys/class/") {
r = device_strjoin_new(s, sysname, NULL, NULL, ret);
r = device_strjoin_new(s, name, NULL, NULL, ret);
if (r < 0)
return r;
if (r > 0)
return 0;
}
} else if (streq(subsystem, "module")) {
r = device_strjoin_new("/sys/module/", sysname, NULL, NULL, ret);
} else if (streq(subsystem, "module")) {
r = device_strjoin_new("/sys/module/", name, NULL, NULL, ret);
if (r < 0)
return r;
if (r > 0)
@ -433,10 +437,10 @@ _public_ int sd_device_new_from_subsystem_sysname(
} else if (streq(subsystem, "drivers")) {
const char *sep;
sep = strchr(sysname, ':');
sep = strchr(name, ':');
if (sep && sep[1] != '\0') { /* Require ":" and something non-empty after that. */
const char *subsys = memdupa_suffix0(sysname, sep - sysname);
const char *subsys = memdupa_suffix0(name, sep - name);
sep++;
if (streq(sep, "drivers")) /* If the sysname is "drivers", then it's the drivers directory itself that is meant. */
@ -450,12 +454,6 @@ _public_ int sd_device_new_from_subsystem_sysname(
}
}
/* translate sysname back to sysfs filename */
name = strdupa_safe(sysname);
for (size_t i = 0; name[i]; i++)
if (name[i] == '/')
name[i] = '!';
r = device_strjoin_new("/sys/bus/", subsystem, "/devices/", name, ret);
if (r < 0)
return r;
@ -468,7 +466,7 @@ _public_ int sd_device_new_from_subsystem_sysname(
if (r > 0)
return 0;
r = device_strjoin_new("/sys/firmware/", subsystem, "/", sysname, ret);
r = device_strjoin_new("/sys/firmware/", subsystem, "/", name, ret);
if (r < 0)
return r;
if (r > 0)

9
src/libsystemd/sd-device/test-sd-device.c
View File

@ -66,7 +66,11 @@ static void test_sd_device_one(sd_device *d) {
assert_se(r == -ENOENT);
r = sd_device_get_subsystem(d, &subsystem);
if (r >= 0) {
if (r < 0)
assert_se(r == -ENOENT);
else if (!streq(subsystem, "gpio")) { /* Unfortunately, there exist /sys/class/gpio and /sys/bus/gpio.
* Hence, sd_device_new_from_subsystem_sysname() and
* sd_device_new_from_device_id() may not work as expected. */
const char *name, *id;
if (streq(subsystem, "drivers"))
@ -102,8 +106,7 @@ static void test_sd_device_one(sd_device *d) {
r = sd_device_get_property_value(d, "ID_NET_DRIVER", &val);
assert_se(r >= 0 || r == -ENOENT);
} else
assert_se(r == -ENOENT);
}
is_block = streq_ptr(subsystem, "block");