shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 02:57:16 +03:00
Code

Merge pull request #1466 from kaysievers/wip

Browse Source 
libsystemd: sd-device - translate / vs. ! in sysname
This commit is contained in:
Tom Gundersen 2015-10-06 11:57:53 +02:00
commit 3d366432c1
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,15 +295,27 @@ _public_ int sd_device_new_from_subsystem_sysname(sd_device **ret, const char *s
} else } else
return -EINVAL; return -EINVAL;
} else { } else {
syspath = strjoina("/sys/subsystem/", subsystem, "/devices/", sysname); char *name;
size_t len = 0;
/* translate sysname back to sysfs filename */
name = strdupa(sysname);
while (name[len] != '\0') {
if (name[len] == '/')
name[len] = '!';
len ++;
}
syspath = strjoina("/sys/subsystem/", subsystem, "/devices/", name);
if (access(syspath, F_OK) >= 0) if (access(syspath, F_OK) >= 0)
return sd_device_new_from_syspath(ret, syspath); return sd_device_new_from_syspath(ret, syspath);
syspath = strjoina("/sys/bus/", subsystem, "/devices/", sysname); syspath = strjoina("/sys/bus/", subsystem, "/devices/", name);
if (access(syspath, F_OK) >= 0) if (access(syspath, F_OK) >= 0)
return sd_device_new_from_syspath(ret, syspath); return sd_device_new_from_syspath(ret, syspath);
syspath = strjoina("/sys/class/", subsystem, "/", sysname); syspath = strjoina("/sys/class/", subsystem, "/", name);
if (access(syspath, F_OK) >= 0) if (access(syspath, F_OK) >= 0)
return sd_device_new_from_syspath(ret, syspath); return sd_device_new_from_syspath(ret, syspath);
} }