char *driver;
char *action;
char *devpath_old;
- char *physdevpath;
+ char *knodename;
char **envp;
char *monitor_buf;
size_t monitor_buf_len;
maj = strtoull(&line[6], NULL, 10);
else if (strncmp(line, "MINOR=", 6) == 0)
min = strtoull(&line[6], NULL, 10);
+ else if (strncmp(line, "DEVNAME=", 8) == 0)
+ udev_device_set_knodename(udev_device, &line[8]);
udev_device_add_property_from_string(udev_device, line);
}
free(udev_device->action);
free(udev_device->driver);
free(udev_device->devpath_old);
- free(udev_device->physdevpath);
+ free(udev_device->knodename);
udev_list_cleanup_entries(udev_device->udev, &udev_device->sysattr_list);
free(udev_device->envp);
free(udev_device->monitor_buf);
#define MONITOR_BUF_SIZE 4096
static int update_envp_monitor_buf(struct udev_device *udev_device)
{
- const char *action;
struct udev_list_entry *list_entry;
size_t bufpos;
size_t len;
if (udev_device->envp == NULL)
return -ENOMEM;
- /* header <action>@<devpath> */
- action = udev_device_get_action(udev_device);
- if (action == NULL)
- return -EINVAL;
- bufpos = util_strlcpy(udev_device->monitor_buf, action, MONITOR_BUF_SIZE);
- len = util_strlcpy(&udev_device->monitor_buf[bufpos], "@", MONITOR_BUF_SIZE-bufpos);
- if (len >= MONITOR_BUF_SIZE-bufpos)
- return -EINVAL;
- bufpos += len;
- len = util_strlcpy(&udev_device->monitor_buf[bufpos],
- udev_device_get_devpath(udev_device),
- MONITOR_BUF_SIZE-bufpos);
- if (len+1 >= MONITOR_BUF_SIZE-bufpos)
- return -EINVAL;
- bufpos += len+1;
-
i = 0;
+ bufpos = 0;
udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
/* add string to envp array */
udev_device->envp[i++] = &udev_device->monitor_buf[bufpos];
return 0;
}
-const char *udev_device_get_physdevpath(struct udev_device *udev_device)
+const char *udev_device_get_knodename(struct udev_device *udev_device)
{
- return udev_device->physdevpath;
+ return udev_device->knodename;
}
-int udev_device_set_physdevpath(struct udev_device *udev_device, const char *physdevpath)
+int udev_device_set_knodename(struct udev_device *udev_device, const char *knodename)
{
- udev_device->physdevpath = strdup(physdevpath);
- if (udev_device->physdevpath == NULL)
+ udev_device->knodename = strdup(knodename);
+ if (udev_device->knodename == NULL)
return -ENOMEM;
return 0;
}