* Representation of kernel sys devices. Devices are uniquely identified
* by their syspath, every device has exactly one path in the kernel sys
* filesystem. Devices usually belong to a kernel subsystem, and and have
- * a unique name inside that subsytem.
+ * a unique name inside that subsystem.
*/
/**
char *driver;
char *action;
char *devpath_old;
+ char *sysname_old;
char *knodename;
char **envp;
char *monitor_buf;
unsigned int ignore_remove:1;
};
-static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *filename, size_t len)
-{
- char *s;
- size_t l;
-
- s = filename;
- l = util_strpcpyl(&s, len, udev_get_dev_path(udev), "/.udev/db/", NULL);
- return util_path_encode(devpath, s, l);
-}
-
int udev_device_read_db(struct udev_device *udev_device)
{
struct stat stats;
char line[UTIL_LINE_SIZE];
FILE *f;
- devpath_to_db_path(udev_device->udev, udev_device->devpath, filename, sizeof(filename));
+ util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_device->udev), "/.udev/db/",
+ udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname(udev_device), NULL);
if (lstat(filename, &stats) != 0) {
dbg(udev_device->udev, "no db file to read %s: %m\n", filename);
next = &next[1];
}
util_strscpyl(devlink, sizeof(devlink), udev_get_dev_path(udev_device->udev), "/", lnk, NULL);
- udev_device_add_devlink(udev_device, devlink);
+ udev_device_add_devlink(udev_device, devlink, 0);
}
info(udev_device->udev, "device %p filled with db symlink data '%s'\n", udev_device, udev_device->devnode);
return 0;
break;
case 'S':
util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_device->udev), "/", val, NULL);
- udev_device_add_devlink(udev_device, filename);
+ udev_device_add_devlink(udev_device, filename, 0);
break;
case 'L':
udev_device_set_devlink_priority(udev_device, atoi(val));
* @syspath: sys device path including sys directory
*
* Create new udev device, and fill in information from the sys
- * device and the udev database entry. The sypath is the absolute
+ * device and the udev database entry. The syspath is the absolute
* path to the device, including the sys mount point.
*
* The initial refcount is 1, and needs to be decremented to
/**
* udev_device_new_from_subsystem_sysname:
* @udev: udev library context
- * @subsystem: the subsytem of the device
+ * @subsystem: the subsystem of the device
* @sysname: the name of the device
*
* Create new udev device, and fill in information from the sys
* device and the udev database entry. The device is looked up
- * by the subsytem and name string of the device, like "mem",
+ * by the subsystem and name string of the device, like "mem",
* "zero", or "block", "sda".
*
* The initial refcount is 1, and needs to be decremented to
* child device, and will be cleaned up when the child device
* is cleaned up.
*
- * It is not neccessarily just the upper level directory, empty or not
+ * It is not necessarily just the upper level directory, empty or not
* recognized sys directories are ignored.
*
* It can be called as many times as needed, without caring about
/**
* udev_device_get_parent_with_subsystem_devtype:
* @udev_device: udev device to start searching from
- * @subsystem: the subsytem of the device
+ * @subsystem: the subsystem of the device
* @devtype: the type (DEVTYPE) of the device
*
* Find the next parent device, with a matching subsystem and devtype
free(udev_device->action);
free(udev_device->driver);
free(udev_device->devpath_old);
+ free(udev_device->sysname_old);
free(udev_device->knodename);
udev_list_cleanup_entries(udev_device->udev, &udev_device->sysattr_list);
free(udev_device->envp);
return NULL;
if (!udev_device->subsystem_set) {
udev_device->subsystem_set = 1;
- /* read "subsytem" link */
+ /* read "subsystem" link */
if (util_get_sys_subsystem(udev_device->udev, udev_device->syspath, subsystem, sizeof(subsystem)) > 0) {
udev_device_set_subsystem(udev_device, subsystem);
return udev_device->subsystem;
* @udev_device: udev device
* @sysattr: attribute name
*
- * The retrieved value is cached in the device. Repeated reads will return the same
+ * The retrieved value is cached in the device. Repeated calls will return the same
* value and not open the attribute again.
*
* Returns: the content of a sys attribute file, or #NULL if there is no sys attribute value.
return 0;
}
-int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink)
+int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink, int unique)
{
+ struct udev_list_entry *list_entry;
+
udev_device->devlinks_uptodate = 0;
- if (udev_list_entry_add(udev_device->udev, &udev_device->devlinks_list, devlink, NULL, 1, 0) == NULL)
+ list_entry = udev_list_entry_add(udev_device->udev, &udev_device->devlinks_list, devlink, NULL, 1, 0);
+ if (list_entry == NULL)
return -ENOMEM;
+ if (unique)
+ udev_list_entry_set_flag(list_entry, 1);
return 0;
}
int udev_device_set_devpath_old(struct udev_device *udev_device, const char *devpath_old)
{
+ const char *pos;
+ size_t len;
+
+ free(udev_device->devpath_old);
udev_device->devpath_old = strdup(devpath_old);
if (udev_device->devpath_old == NULL)
return -ENOMEM;
udev_device_add_property(udev_device, "DEVPATH_OLD", udev_device->devpath_old);
+
+ pos = strrchr(udev_device->devpath_old, '/');
+ if (pos == NULL)
+ return -EINVAL;
+ udev_device->sysname_old = strdup(&pos[1]);
+ if (udev_device->sysname_old == NULL)
+ return -ENOMEM;
+
+ /* some devices have '!' in their name, change that to '/' */
+ len = 0;
+ while (udev_device->sysname_old[len] != '\0') {
+ if (udev_device->sysname_old[len] == '!')
+ udev_device->sysname_old[len] = '/';
+ len++;
+ }
return 0;
}
+const char *udev_device_get_sysname_old(struct udev_device *udev_device)
+{
+ if (udev_device == NULL)
+ return NULL;
+ return udev_device->sysname_old;
+}
+
const char *udev_device_get_knodename(struct udev_device *udev_device)
{
return udev_device->knodename;
int udev_device_set_knodename(struct udev_device *udev_device, const char *knodename)
{
+ free(udev_device->knodename);
udev_device->knodename = strdup(knodename);
if (udev_device->knodename == NULL)
return -ENOMEM;
+ udev_device_add_property(udev_device, "DEVNAME", udev_device->knodename);
return 0;
}
~ianmdlvl / elogind.git / blobdiff