pos = strrchr(link_target, '/');
if (pos != NULL)
strlcpy(dev->subsystem, &pos[1], sizeof(dev->subsystem));
- } else if (strncmp(dev->devpath, "/class/", 7) == 0) {
- /* get subsystem from class dir */
- strlcpy(dev->subsystem, &dev->devpath[7], sizeof(dev->subsystem));
- pos = strchr(dev->subsystem, '/');
- if (pos != NULL)
- pos[0] = '\0';
- else
- strlcpy(dev->subsystem, "subsystem", sizeof(dev->subsystem));
- } else if (strncmp(dev->devpath, "/block/", 7) == 0) {
- strlcpy(dev->subsystem, "block", sizeof(dev->subsystem));
- } else if (strncmp(dev->devpath, "/devices/", 9) == 0) {
- /* get subsystem from "bus" link */
- strlcpy(link_path, sysfs_path, sizeof(link_path));
- strlcat(link_path, dev->devpath, sizeof(link_path));
- strlcat(link_path, "/bus", sizeof(link_path));
- len = readlink(link_path, link_target, sizeof(link_target));
- if (len > 0) {
- link_target[len] = '\0';
- dbg("bus link '%s' points to '%s'", link_path, link_target);
- pos = strrchr(link_target, '/');
- if (pos != NULL)
- strlcpy(dev->subsystem, &pos[1], sizeof(dev->subsystem));
- }
} else if (strstr(dev->devpath, "/drivers/") != NULL) {
strlcpy(dev->subsystem, "drivers", sizeof(dev->subsystem));
} else if (strncmp(dev->devpath, "/module/", 8) == 0) {
pos = strrchr(dev->devpath, '/');
if (pos == &dev->devpath[10])
strlcpy(dev->subsystem, "subsystem", sizeof(dev->subsystem));
+ } else if (strncmp(dev->devpath, "/class/", 7) == 0) {
+ pos = strrchr(dev->devpath, '/');
+ if (pos == &dev->devpath[6])
+ strlcpy(dev->subsystem, "subsystem", sizeof(dev->subsystem));
} else if (strncmp(dev->devpath, "/bus/", 5) == 0) {
pos = strrchr(dev->devpath, '/');
if (pos == &dev->devpath[4])
dbg("open '%s'/'%s'", devpath, attr_name);
sysfs_len = strlcpy(path_full, sysfs_path, sizeof(path_full));
+ if(sysfs_len >= sizeof(path_full))
+ sysfs_len = sizeof(path_full) - 1;
path = &path_full[sysfs_len];
strlcat(path_full, devpath, sizeof(path_full));
strlcat(path_full, "/", sizeof(path_full));
/* read attribute value */
fd = open(path_full, O_RDONLY);
if (fd < 0) {
- dbg("attribute '%s' does not exist", path_full);
+ dbg("attribute '%s' can not be opened", path_full);
goto out;
}
size = read(fd, value, sizeof(value));