X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev-device.c;h=731230efd0143858bd9da1072d60696fdbd6fd46;hp=918398b7930aa7bc59ef5a6602ed4b197cc97d60;hb=fb762bb928772f1923fef1e342d8ebca9bf7691f;hpb=0518da3b74a388680896747696b3644bbd3d98e5
diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index 918398b79..731230efd 100644
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -17,8 +17,6 @@
* along with this program. If not, see .
*/
-#include "config.h"
-
#include
#include
#include
@@ -56,14 +54,14 @@ struct udev_device {
struct list_head attr_list;
};
-static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *filename, size_t len)
+static size_t syspath_to_db_path(struct udev_device *udev_device, char *filename, size_t len)
{
size_t start;
/* translate to location of db file */
- util_strlcpy(filename, udev_get_dev_path(udev), len);
+ util_strlcpy(filename, udev_get_dev_path(udev_device->udev), len);
start = util_strlcat(filename, "/.udev/db/", len);
- util_strlcat(filename, devpath, len);
+ util_strlcat(filename, udev_device->devpath, len);
return util_path_encode(&filename[start], len - start);
}
@@ -75,7 +73,7 @@ static int device_read_db(struct udev_device *udev_device)
FILE *f;
int rc = 0;
- devpath_to_db_path(udev_device->udev, udev_device->devpath, filename, sizeof(filename));
+ syspath_to_db_path(udev_device, filename, sizeof(filename));
if (lstat(filename, &stats) != 0) {
info(udev_device->udev, "no db file to read %s: %s\n", filename, strerror(errno));
@@ -172,20 +170,20 @@ struct udev_device *device_init(struct udev *udev)
}
/**
- * udev_device_new_from_devpath:
+ * udev_device_new_from_syspath:
* @udev: udev library context
- * @devpath: sys device path
+ * @syspath: sys device path including sys directory
*
- * Create new udev device, and fill in information from the sysfs
- * device and the udev database entry. The devpath must not contain
- * the sysfs mount path, and must contain a leading '/'.
+ * Create new udev device, and fill in information from the sys
+ * device and the udev database entry. The sypath is the absolute
+ * path to the device, including the sys mount point.
*
* The initial refcount is 1, and needs to be decremented to
* release the ressources of the udev device.
*
* Returns: a new udev device, or #NULL, if it does not exist
**/
-struct udev_device *udev_device_new_from_devpath(struct udev *udev, const char *devpath)
+struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *syspath)
{
char path[UTIL_PATH_SIZE];
struct stat statbuf;
@@ -193,14 +191,13 @@ struct udev_device *udev_device_new_from_devpath(struct udev *udev, const char *
if (udev == NULL)
return NULL;
- if (devpath == NULL)
+ if (syspath == NULL)
return NULL;
- util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
- util_strlcat(path, devpath, sizeof(path));
+ util_strlcpy(path, syspath, sizeof(path));
util_strlcat(path, "/uevent", sizeof(path));
if (stat(path, &statbuf) != 0) {
- info(udev, "not a device :%s\n", devpath);
+ info(udev, "not a device :%s\n", syspath);
return NULL;
}
@@ -209,9 +206,9 @@ struct udev_device *udev_device_new_from_devpath(struct udev *udev, const char *
return NULL;
/* resolve possible symlink to real path */
- util_strlcpy(path, devpath, sizeof(path));
+ util_strlcpy(path, syspath, sizeof(path));
util_resolve_sys_link(udev, path, sizeof(path));
- device_set_devpath(udev_device, path);
+ device_set_syspath(udev_device, path);
info(udev, "device %p has devpath '%s'\n", udev_device, udev_device_get_devpath(udev_device));
if (device_read_db(udev_device) >= 0)
@@ -228,23 +225,23 @@ static struct udev_device *device_new_from_parent(struct udev_device *udev_devic
if (udev_device == NULL)
return NULL;
- util_strlcpy(path, udev_device_get_devpath(udev_device), sizeof(path));
+ util_strlcpy(path, udev_device->syspath, sizeof(path));
while (1) {
pos = strrchr(path, '/');
if (pos == path || pos == NULL)
break;
pos[0] = '\0';
- udev_device_parent = udev_device_new_from_devpath(udev_device->udev, path);
+ udev_device_parent = udev_device_new_from_syspath(udev_device->udev, path);
if (udev_device_parent != NULL)
return udev_device_parent;
}
- /* follow "device" link in deprecated sysfs /sys/class/ layout */
+ /* follow "device" link in deprecated sys /sys/class/ layout */
if (strncmp(udev_device->devpath, "/class/", 7) == 0) {
- util_strlcpy(path, udev_device->devpath, sizeof(path));
+ util_strlcpy(path, udev_device->syspath, sizeof(path));
util_strlcat(path, "/device", sizeof(path));
if (util_resolve_sys_link(udev_device->udev, path, sizeof(path)) == 0) {
- udev_device_parent = udev_device_new_from_devpath(udev_device->udev, path);
+ udev_device_parent = udev_device_new_from_syspath(udev_device->udev, path);
if (udev_device_parent != NULL)
return udev_device_parent;
}
@@ -364,7 +361,7 @@ const char *udev_device_get_sysname(struct udev_device *udev_device)
}
/**
- * udev_device_get_devname:
+ * udev_device_get_devnode:
* @udev_device: udev device
*
* Retrieve the device node file name belonging to the udev device.
@@ -372,7 +369,7 @@ const char *udev_device_get_sysname(struct udev_device *udev_device)
*
* Returns: the device node file name of the udev device, or #NULL if no device node exists
**/
-const char *udev_device_get_devname(struct udev_device *udev_device)
+const char *udev_device_get_devnode(struct udev_device *udev_device)
{
if (udev_device == NULL)
return NULL;
@@ -398,7 +395,7 @@ const char *udev_device_get_subsystem(struct udev_device *udev_device)
return udev_device->subsystem;
/* read "subsytem" link */
- if (util_get_sys_subsystem(udev_device->udev, udev_device->devpath, subsystem, sizeof(subsystem)) == 0) {
+ if (util_get_sys_subsystem(udev_device->udev, udev_device->syspath, subsystem, sizeof(subsystem)) > 0) {
udev_device->subsystem = strdup(subsystem);
return udev_device->subsystem;
}
@@ -490,7 +487,7 @@ const char *udev_device_get_driver(struct udev_device *udev_device)
return NULL;
if (udev_device->driver != NULL)
return udev_device->driver;
- if (util_get_sys_driver(udev_device->udev, udev_device->devpath, driver, sizeof(driver)) < 2)
+ if (util_get_sys_driver(udev_device->udev, udev_device->syspath, driver, sizeof(driver)) < 2)
return NULL;
udev_device->driver = strdup(driver);
return udev_device->driver;
@@ -592,14 +589,18 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch
out:
return val;
}
-int device_set_devpath(struct udev_device *udev_device, const char *devpath)
+int device_set_syspath(struct udev_device *udev_device, const char *syspath)
{
- if (asprintf(&udev_device->syspath, "%s%s", udev_get_sys_path(udev_device->udev), devpath) < 0)
+ const char *pos;
+
+ udev_device->syspath = strdup(syspath);
+ if (udev_device->syspath == NULL)
return -ENOMEM;
udev_device->devpath = &udev_device->syspath[strlen(udev_get_sys_path(udev_device->udev))];
- udev_device->sysname = strrchr(udev_device->syspath, '/');
- if (udev_device->sysname != NULL)
- udev_device->sysname = &udev_device->sysname[1];
+ pos = strrchr(udev_device->syspath, '/');
+ if (pos == NULL)
+ return -EINVAL;
+ udev_device->sysname = &pos[1];
return 0;
}