/*
- * Copyright (C) 2005-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005-2008 Kay Sievers <kay.sievers@vrfy.org>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
*
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
#include <stdlib.h>
#include <stdio.h>
#include <stddef.h>
#include <unistd.h>
+#include <string.h>
#include <fcntl.h>
#include <ctype.h>
#include <errno.h>
#include "udev.h"
-char sysfs_path[PATH_SIZE];
-
/* device cache */
static LIST_HEAD(dev_list);
/* attribute value cache */
static LIST_HEAD(attr_list);
+
struct sysfs_attr {
struct list_head node;
- char path[PATH_SIZE];
+ char path[UTIL_PATH_SIZE];
char *value; /* points to value_local if value is cached */
- char value_local[NAME_SIZE];
+ char value_local[UTIL_NAME_SIZE];
};
-int sysfs_init(void)
+static int resolve_sys_link(struct udev *udev, char *path, size_t size)
{
- const char *env;
+ char link_path[UTIL_PATH_SIZE];
+ char link_target[UTIL_PATH_SIZE];
+
+ int len;
+ int i;
+ int back;
+
+ util_strlcpy(link_path, udev_get_sys_path(udev), sizeof(link_path));
+ util_strlcat(link_path, path, sizeof(link_path));
+ len = readlink(link_path, link_target, sizeof(link_target));
+ if (len <= 0)
+ return -1;
+ link_target[len] = '\0';
+ dbg(udev, "path link '%s' points to '%s'\n", path, link_target);
+
+ for (back = 0; strncmp(&link_target[back * 3], "../", 3) == 0; back++)
+ ;
+ dbg(udev, "base '%s', tail '%s', back %i\n", path, &link_target[back * 3], back);
+ for (i = 0; i <= back; i++) {
+ char *pos = strrchr(path, '/');
- env = getenv("SYSFS_PATH");
- if (env) {
- strlcpy(sysfs_path, env, sizeof(sysfs_path));
- remove_trailing_chars(sysfs_path, '/');
- } else
- strlcpy(sysfs_path, "/sys", sizeof(sysfs_path));
- dbg("sysfs_path='%s'\n", sysfs_path);
+ if (pos == NULL)
+ return -1;
+ pos[0] = '\0';
+ }
+ dbg(udev, "after moving back '%s'\n", path);
+ util_strlcat(path, "/", size);
+ util_strlcat(path, &link_target[back * 3], size);
+ return 0;
+}
+int sysfs_init(void)
+{
INIT_LIST_HEAD(&dev_list);
INIT_LIST_HEAD(&attr_list);
return 0;
}
}
-void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath,
+void sysfs_device_set_values(struct udev *udev,
+ struct sysfs_device *dev, const char *devpath,
const char *subsystem, const char *driver)
{
char *pos;
- strlcpy(dev->devpath, devpath, sizeof(dev->devpath));
+ util_strlcpy(dev->devpath, devpath, sizeof(dev->devpath));
if (subsystem != NULL)
- strlcpy(dev->subsystem, subsystem, sizeof(dev->subsystem));
+ util_strlcpy(dev->subsystem, subsystem, sizeof(dev->subsystem));
if (driver != NULL)
- strlcpy(dev->driver, driver, sizeof(dev->driver));
+ util_strlcpy(dev->driver, driver, sizeof(dev->driver));
/* set kernel name */
pos = strrchr(dev->devpath, '/');
if (pos == NULL)
return;
- strlcpy(dev->kernel, &pos[1], sizeof(dev->kernel));
- dbg("kernel='%s'\n", dev->kernel);
+ util_strlcpy(dev->kernel, &pos[1], sizeof(dev->kernel));
+ dbg(udev, "kernel='%s'\n", dev->kernel);
/* some devices have '!' in their name, change that to '/' */
pos = dev->kernel;
pos = &dev->kernel[strlen(dev->kernel)];
while (isdigit(pos[-1]))
pos--;
- strlcpy(dev->kernel_number, pos, sizeof(dev->kernel_number));
- dbg("kernel_number='%s'\n", dev->kernel_number);
-}
-
-int sysfs_resolve_link(char *devpath, size_t size)
-{
- char link_path[PATH_SIZE];
- char link_target[PATH_SIZE];
- int len;
- int i;
- int back;
-
- strlcpy(link_path, sysfs_path, sizeof(link_path));
- strlcat(link_path, devpath, sizeof(link_path));
- len = readlink(link_path, link_target, sizeof(link_target));
- if (len <= 0)
- return -1;
- link_target[len] = '\0';
- dbg("path link '%s' points to '%s'\n", devpath, link_target);
-
- for (back = 0; strncmp(&link_target[back * 3], "../", 3) == 0; back++)
- ;
- dbg("base '%s', tail '%s', back %i\n", devpath, &link_target[back * 3], back);
- for (i = 0; i <= back; i++) {
- char *pos = strrchr(devpath, '/');
-
- if (pos == NULL)
- return -1;
- pos[0] = '\0';
- }
- dbg("after moving back '%s'\n", devpath);
- strlcat(devpath, "/", size);
- strlcat(devpath, &link_target[back * 3], size);
- return 0;
+ util_strlcpy(dev->kernel_number, pos, sizeof(dev->kernel_number));
+ dbg(udev, "kernel_number='%s'\n", dev->kernel_number);
}
-struct sysfs_device *sysfs_device_get(const char *devpath)
+struct sysfs_device *sysfs_device_get(struct udev *udev, const char *devpath)
{
- char path[PATH_SIZE];
- char devpath_real[PATH_SIZE];
+ char path[UTIL_PATH_SIZE];
+ char devpath_real[UTIL_PATH_SIZE];
struct sysfs_device *dev;
struct sysfs_device *dev_loop;
struct stat statbuf;
- char link_path[PATH_SIZE];
- char link_target[PATH_SIZE];
+ char link_path[UTIL_PATH_SIZE];
+ char link_target[UTIL_PATH_SIZE];
int len;
char *pos;
strncmp(devpath, "/block/", 7) != 0)
return NULL;
- dbg("open '%s'\n", devpath);
- strlcpy(devpath_real, devpath, sizeof(devpath_real));
- remove_trailing_chars(devpath_real, '/');
+ dbg(udev, "open '%s'\n", devpath);
+ util_strlcpy(devpath_real, devpath, sizeof(devpath_real));
+ util_remove_trailing_chars(devpath_real, '/');
if (devpath[0] == '\0' )
return NULL;
/* look for device already in cache (we never put an untranslated path in the cache) */
list_for_each_entry(dev_loop, &dev_list, node) {
if (strcmp(dev_loop->devpath, devpath_real) == 0) {
- dbg("found in cache '%s'\n", dev_loop->devpath);
+ dbg(udev, "found in cache '%s'\n", dev_loop->devpath);
return dev_loop;
}
}
/* if we got a link, resolve it to the real device */
- strlcpy(path, sysfs_path, sizeof(path));
- strlcat(path, devpath_real, sizeof(path));
+ util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
+ util_strlcat(path, devpath_real, sizeof(path));
if (lstat(path, &statbuf) != 0) {
- dbg("stat '%s' failed: %s\n", path, strerror(errno));
+ dbg(udev, "stat '%s' failed: %m\n", path);
return NULL;
}
if (S_ISLNK(statbuf.st_mode)) {
- if (sysfs_resolve_link(devpath_real, sizeof(devpath_real)) != 0)
+ if (resolve_sys_link(udev, devpath_real, sizeof(devpath_real)) != 0)
return NULL;
/* now look for device in cache after path translation */
list_for_each_entry(dev_loop, &dev_list, node) {
if (strcmp(dev_loop->devpath, devpath_real) == 0) {
- dbg("found in cache '%s'\n", dev_loop->devpath);
+ dbg(udev, "found in cache '%s'\n", dev_loop->devpath);
return dev_loop;
}
}
}
/* it is a new device */
- dbg("new uncached device '%s'\n", devpath_real);
+ dbg(udev, "new uncached device '%s'\n", devpath_real);
dev = malloc(sizeof(struct sysfs_device));
if (dev == NULL)
return NULL;
memset(dev, 0x00, sizeof(struct sysfs_device));
- sysfs_device_set_values(dev, devpath_real, NULL, NULL);
+ sysfs_device_set_values(udev, dev, devpath_real, NULL, NULL);
/* get subsystem name */
- strlcpy(link_path, sysfs_path, sizeof(link_path));
- strlcat(link_path, dev->devpath, sizeof(link_path));
- strlcat(link_path, "/subsystem", sizeof(link_path));
+ util_strlcpy(link_path, udev_get_sys_path(udev), sizeof(link_path));
+ util_strlcat(link_path, dev->devpath, sizeof(link_path));
+ util_strlcat(link_path, "/subsystem", sizeof(link_path));
len = readlink(link_path, link_target, sizeof(link_target));
if (len > 0) {
/* get subsystem from "subsystem" link */
link_target[len] = '\0';
- dbg("subsystem link '%s' points to '%s'\n", link_path, link_target);
+ dbg(udev, "subsystem link '%s' points to '%s'\n", link_path, link_target);
pos = strrchr(link_target, '/');
if (pos != NULL)
- strlcpy(dev->subsystem, &pos[1], sizeof(dev->subsystem));
+ util_strlcpy(dev->subsystem, &pos[1], sizeof(dev->subsystem));
} else if (strstr(dev->devpath, "/drivers/") != NULL) {
- strlcpy(dev->subsystem, "drivers", sizeof(dev->subsystem));
+ util_strlcpy(dev->subsystem, "drivers", sizeof(dev->subsystem));
} else if (strncmp(dev->devpath, "/module/", 8) == 0) {
- strlcpy(dev->subsystem, "module", sizeof(dev->subsystem));
+ util_strlcpy(dev->subsystem, "module", sizeof(dev->subsystem));
} else if (strncmp(dev->devpath, "/subsystem/", 11) == 0) {
pos = strrchr(dev->devpath, '/');
if (pos == &dev->devpath[10])
- strlcpy(dev->subsystem, "subsystem", sizeof(dev->subsystem));
+ util_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));
+ util_strlcpy(dev->subsystem, "subsystem", sizeof(dev->subsystem));
} else if (strncmp(dev->devpath, "/bus/", 5) == 0) {
pos = strrchr(dev->devpath, '/');
if (pos == &dev->devpath[4])
- strlcpy(dev->subsystem, "subsystem", sizeof(dev->subsystem));
+ util_strlcpy(dev->subsystem, "subsystem", sizeof(dev->subsystem));
}
/* get driver name */
- strlcpy(link_path, sysfs_path, sizeof(link_path));
- strlcat(link_path, dev->devpath, sizeof(link_path));
- strlcat(link_path, "/driver", sizeof(link_path));
+ util_strlcpy(link_path, udev_get_sys_path(udev), sizeof(link_path));
+ util_strlcat(link_path, dev->devpath, sizeof(link_path));
+ util_strlcat(link_path, "/driver", sizeof(link_path));
len = readlink(link_path, link_target, sizeof(link_target));
if (len > 0) {
link_target[len] = '\0';
- dbg("driver link '%s' points to '%s'\n", link_path, link_target);
+ dbg(udev, "driver link '%s' points to '%s'\n", link_path, link_target);
pos = strrchr(link_target, '/');
if (pos != NULL)
- strlcpy(dev->driver, &pos[1], sizeof(dev->driver));
+ util_strlcpy(dev->driver, &pos[1], sizeof(dev->driver));
}
- dbg("add to cache 'devpath=%s', subsystem='%s', driver='%s'\n", dev->devpath, dev->subsystem, dev->driver);
+ dbg(udev, "add to cache 'devpath=%s', subsystem='%s', driver='%s'\n", dev->devpath, dev->subsystem, dev->driver);
list_add(&dev->node, &dev_list);
return dev;
}
-struct sysfs_device *sysfs_device_get_parent(struct sysfs_device *dev)
+struct sysfs_device *sysfs_device_get_parent(struct udev *udev, struct sysfs_device *dev)
{
- char parent_devpath[PATH_SIZE];
+ char parent_devpath[UTIL_PATH_SIZE];
char *pos;
- dbg("open '%s'\n", dev->devpath);
+ dbg(udev, "open '%s'\n", dev->devpath);
/* look if we already know the parent */
if (dev->parent != NULL)
return dev->parent;
- strlcpy(parent_devpath, dev->devpath, sizeof(parent_devpath));
- dbg("'%s'\n", parent_devpath);
+ util_strlcpy(parent_devpath, dev->devpath, sizeof(parent_devpath));
+ dbg(udev, "'%s'\n", parent_devpath);
/* strip last element */
pos = strrchr(parent_devpath, '/');
if (strncmp(parent_devpath, "/class", 6) == 0) {
pos = strrchr(parent_devpath, '/');
if (pos == &parent_devpath[6] || pos == parent_devpath) {
- dbg("/class top level, look for device link\n");
+ dbg(udev, "/class top level, look for device link\n");
goto device_link;
}
}
if (strcmp(parent_devpath, "/block") == 0) {
- dbg("/block top level, look for device link\n");
+ dbg(udev, "/block top level, look for device link\n");
goto device_link;
}
return NULL;
/* get parent and remember it */
- dev->parent = sysfs_device_get(parent_devpath);
+ dev->parent = sysfs_device_get(udev, parent_devpath);
return dev->parent;
device_link:
- strlcpy(parent_devpath, dev->devpath, sizeof(parent_devpath));
- strlcat(parent_devpath, "/device", sizeof(parent_devpath));
- if (sysfs_resolve_link(parent_devpath, sizeof(parent_devpath)) != 0)
+ util_strlcpy(parent_devpath, dev->devpath, sizeof(parent_devpath));
+ util_strlcat(parent_devpath, "/device", sizeof(parent_devpath));
+ if (resolve_sys_link(udev, parent_devpath, sizeof(parent_devpath)) != 0)
return NULL;
/* get parent and remember it */
- dev->parent = sysfs_device_get(parent_devpath);
+ dev->parent = sysfs_device_get(udev, parent_devpath);
return dev->parent;
}
-struct sysfs_device *sysfs_device_get_parent_with_subsystem(struct sysfs_device *dev, const char *subsystem)
+struct sysfs_device *sysfs_device_get_parent_with_subsystem(struct udev *udev, struct sysfs_device *dev, const char *subsystem)
{
struct sysfs_device *dev_parent;
- dev_parent = sysfs_device_get_parent(dev);
+ dev_parent = sysfs_device_get_parent(udev, dev);
while (dev_parent != NULL) {
if (strcmp(dev_parent->subsystem, subsystem) == 0)
return dev_parent;
- dev_parent = sysfs_device_get_parent(dev_parent);
+ dev_parent = sysfs_device_get_parent(udev, dev_parent);
}
return NULL;
}
-char *sysfs_attr_get_value(const char *devpath, const char *attr_name)
+char *sysfs_attr_get_value(struct udev *udev, const char *devpath, const char *attr_name)
{
- char path_full[PATH_SIZE];
+ char path_full[UTIL_PATH_SIZE];
const char *path;
- char value[NAME_SIZE];
+ char value[UTIL_NAME_SIZE];
struct sysfs_attr *attr_loop;
struct sysfs_attr *attr;
struct stat statbuf;
ssize_t size;
size_t sysfs_len;
- dbg("open '%s'/'%s'\n", devpath, attr_name);
- sysfs_len = strlcpy(path_full, sysfs_path, sizeof(path_full));
+ dbg(udev, "open '%s'/'%s'\n", devpath, attr_name);
+ sysfs_len = util_strlcpy(path_full, udev_get_sys_path(udev), 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));
- strlcat(path_full, attr_name, sizeof(path_full));
+ util_strlcat(path_full, devpath, sizeof(path_full));
+ util_strlcat(path_full, "/", sizeof(path_full));
+ util_strlcat(path_full, attr_name, sizeof(path_full));
/* look for attribute in cache */
list_for_each_entry(attr_loop, &attr_list, node) {
if (strcmp(attr_loop->path, path) == 0) {
- dbg("found in cache '%s'\n", attr_loop->path);
+ dbg(udev, "found in cache '%s'\n", attr_loop->path);
return attr_loop->value;
}
}
/* store attribute in cache (also negatives are kept in cache) */
- dbg("new uncached attribute '%s'\n", path_full);
+ dbg(udev, "new uncached attribute '%s'\n", path_full);
attr = malloc(sizeof(struct sysfs_attr));
if (attr == NULL)
return NULL;
memset(attr, 0x00, sizeof(struct sysfs_attr));
- strlcpy(attr->path, path, sizeof(attr->path));
- dbg("add to cache '%s'\n", path_full);
+ util_strlcpy(attr->path, path, sizeof(attr->path));
+ dbg(udev, "add to cache '%s'\n", path_full);
list_add(&attr->node, &attr_list);
if (lstat(path_full, &statbuf) != 0) {
- dbg("stat '%s' failed: %s\n", path_full, strerror(errno));
+ dbg(udev, "stat '%s' failed: %m\n", path_full);
goto out;
}
if (S_ISLNK(statbuf.st_mode)) {
/* links return the last element of the target path */
- char link_target[PATH_SIZE];
+ char link_target[UTIL_PATH_SIZE];
int len;
const char *pos;
link_target[len] = '\0';
pos = strrchr(link_target, '/');
if (pos != NULL) {
- dbg("cache '%s' with link value '%s'\n", path_full, value);
- strlcpy(attr->value_local, &pos[1], sizeof(attr->value_local));
+ dbg(udev, "cache '%s' with link value '%s'\n", path_full, value);
+ util_strlcpy(attr->value_local, &pos[1], sizeof(attr->value_local));
attr->value = attr->value_local;
}
}
/* read attribute value */
fd = open(path_full, O_RDONLY);
if (fd < 0) {
- dbg("attribute '%s' can not be opened\n", path_full);
+ dbg(udev, "attribute '%s' can not be opened\n", path_full);
goto out;
}
size = read(fd, value, sizeof(value));
/* got a valid value, store and return it */
value[size] = '\0';
- remove_trailing_chars(value, '\n');
- dbg("cache '%s' with attribute value '%s'\n", path_full, value);
- strlcpy(attr->value_local, value, sizeof(attr->value_local));
+ util_remove_trailing_chars(value, '\n');
+ dbg(udev, "cache '%s' with attribute value '%s'\n", path_full, value);
+ util_strlcpy(attr->value_local, value, sizeof(attr->value_local));
attr->value = attr->value_local;
out:
return attr->value;
}
-int sysfs_lookup_devpath_by_subsys_id(char *devpath_full, size_t len, const char *subsystem, const char *id)
+int sysfs_lookup_devpath_by_subsys_id(struct udev *udev, char *devpath_full, size_t len, const char *subsystem, const char *id)
{
size_t sysfs_len;
- char path_full[PATH_SIZE];
+ char path_full[UTIL_PATH_SIZE];
char *path;
struct stat statbuf;
- sysfs_len = strlcpy(path_full, sysfs_path, sizeof(path_full));
+ sysfs_len = util_strlcpy(path_full, udev_get_sys_path(udev), sizeof(path_full));
path = &path_full[sysfs_len];
if (strcmp(subsystem, "subsystem") == 0) {
- strlcpy(path, "/subsystem/", sizeof(path_full) - sysfs_len);
- strlcat(path, id, sizeof(path_full) - sysfs_len);
+ util_strlcpy(path, "/subsystem/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, id, sizeof(path_full) - sysfs_len);
if (stat(path_full, &statbuf) == 0)
goto found;
- strlcpy(path, "/bus/", sizeof(path_full) - sysfs_len);
- strlcat(path, id, sizeof(path_full) - sysfs_len);
+ util_strlcpy(path, "/bus/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, id, sizeof(path_full) - sysfs_len);
if (stat(path_full, &statbuf) == 0)
goto found;
goto out;
- strlcpy(path, "/class/", sizeof(path_full) - sysfs_len);
- strlcat(path, id, sizeof(path_full) - sysfs_len);
+ util_strlcpy(path, "/class/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, id, sizeof(path_full) - sysfs_len);
if (stat(path_full, &statbuf) == 0)
goto found;
}
if (strcmp(subsystem, "module") == 0) {
- strlcpy(path, "/module/", sizeof(path_full) - sysfs_len);
- strlcat(path, id, sizeof(path_full) - sysfs_len);
+ util_strlcpy(path, "/module/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, id, sizeof(path_full) - sysfs_len);
if (stat(path_full, &statbuf) == 0)
goto found;
goto out;
}
if (strcmp(subsystem, "drivers") == 0) {
- char subsys[NAME_SIZE];
+ char subsys[UTIL_NAME_SIZE];
char *driver;
- strlcpy(subsys, id, sizeof(subsys));
+ util_strlcpy(subsys, id, sizeof(subsys));
driver = strchr(subsys, ':');
if (driver != NULL) {
driver[0] = '\0';
driver = &driver[1];
- strlcpy(path, "/subsystem/", sizeof(path_full) - sysfs_len);
- strlcat(path, subsys, sizeof(path_full) - sysfs_len);
- strlcat(path, "/drivers/", sizeof(path_full) - sysfs_len);
- strlcat(path, driver, sizeof(path_full) - sysfs_len);
+ util_strlcpy(path, "/subsystem/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, subsys, sizeof(path_full) - sysfs_len);
+ util_strlcat(path, "/drivers/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, driver, sizeof(path_full) - sysfs_len);
if (stat(path_full, &statbuf) == 0)
goto found;
- strlcpy(path, "/bus/", sizeof(path_full) - sysfs_len);
- strlcat(path, subsys, sizeof(path_full) - sysfs_len);
- strlcat(path, "/drivers/", sizeof(path_full) - sysfs_len);
- strlcat(path, driver, sizeof(path_full) - sysfs_len);
+ util_strlcpy(path, "/bus/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, subsys, sizeof(path_full) - sysfs_len);
+ util_strlcat(path, "/drivers/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, driver, sizeof(path_full) - sysfs_len);
if (stat(path_full, &statbuf) == 0)
goto found;
}
goto out;
}
- strlcpy(path, "/subsystem/", sizeof(path_full) - sysfs_len);
- strlcat(path, subsystem, sizeof(path_full) - sysfs_len);
- strlcat(path, "/devices/", sizeof(path_full) - sysfs_len);
- strlcat(path, id, sizeof(path_full) - sysfs_len);
+ util_strlcpy(path, "/subsystem/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, subsystem, sizeof(path_full) - sysfs_len);
+ util_strlcat(path, "/devices/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, id, sizeof(path_full) - sysfs_len);
if (stat(path_full, &statbuf) == 0)
goto found;
- strlcpy(path, "/bus/", sizeof(path_full) - sysfs_len);
- strlcat(path, subsystem, sizeof(path_full) - sysfs_len);
- strlcat(path, "/devices/", sizeof(path_full) - sysfs_len);
- strlcat(path, id, sizeof(path_full) - sysfs_len);
+ util_strlcpy(path, "/bus/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, subsystem, sizeof(path_full) - sysfs_len);
+ util_strlcat(path, "/devices/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, id, sizeof(path_full) - sysfs_len);
if (stat(path_full, &statbuf) == 0)
goto found;
- strlcpy(path, "/class/", sizeof(path_full) - sysfs_len);
- strlcat(path, subsystem, sizeof(path_full) - sysfs_len);
- strlcat(path, "/", sizeof(path_full) - sysfs_len);
- strlcat(path, id, sizeof(path_full) - sysfs_len);
+ util_strlcpy(path, "/class/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, subsystem, sizeof(path_full) - sysfs_len);
+ util_strlcat(path, "/", sizeof(path_full) - sysfs_len);
+ util_strlcat(path, id, sizeof(path_full) - sysfs_len);
if (stat(path_full, &statbuf) == 0)
goto found;
out:
return 0;
found:
if (S_ISLNK(statbuf.st_mode))
- sysfs_resolve_link(path, sizeof(path_full) - sysfs_len);
- strlcpy(devpath_full, path, len);
+ resolve_sys_link(udev, path, sizeof(path_full) - sysfs_len);
+ util_strlcpy(devpath_full, path, len);
return 1;
}
~ianmdlvl / elogind.git / blobdiff