break;
case SUBST_DRIVER:
if (event->dev_parent != NULL) {
- const char *driver = udev_device_get_driver(event->dev_parent);
+ const char *driver;
+ driver = udev_device_get_driver(event->dev_parent);
if (driver == NULL)
break;
util_strlcat(string, driver, maxsize);
size = strlen(value);
while (size > 0 && isspace(value[--size]))
value[size] = '\0';
- count = util_replace_chars(value, ALLOWED_CHARS_INPUT);
+ count = udev_util_replace_chars(value, UDEV_ALLOWED_CHARS_INPUT);
if (count > 0)
info(event->udev, "%i character(s) replaced\n" , count);
util_strlcat(string, value, maxsize);
break;
case SUBST_LINKS:
{
+ size_t devlen = strlen(udev_get_dev_path(event->udev))+1;
struct udev_list_entry *list_entry;
list_entry = udev_device_get_devlinks_list_entry(dev);
- util_strlcat(string, udev_list_entry_get_name(list_entry), maxsize);
+ if (list_entry == NULL)
+ break;
+ util_strlcat(string, &udev_list_entry_get_name(list_entry)[devlen], maxsize);
udev_list_entry_foreach(list_entry, udev_list_entry_get_next(list_entry)) {
util_strlcat(string, " ", maxsize);
- util_strlcat(string, udev_list_entry_get_name(list_entry), maxsize);
+ util_strlcat(string, &udev_list_entry_get_name(list_entry)[devlen], maxsize);
}
}
break;
if (list_entry == NULL)
break;
value = udev_list_entry_get_value(list_entry);
+ if (value == NULL)
+ break;
dbg(event->udev, "substitute env '%s=%s'\n", attr, value);
util_strlcat(string, value, maxsize);
break;
/* wait 30 seconds for our target to become available */
util_strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
- util_strlcpy(ifr.ifr_newname, udev_device_get_devnode(dev), IFNAMSIZ);
+ util_strlcpy(ifr.ifr_newname, event->name, IFNAMSIZ);
loop = 30 * 20;
while (loop--) {
err = ioctl(sk, SIOCSIFNAME, &ifr);
break;
}
dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
- udev_device_get_devnode(dev), (30 * 20) - loop);
+ event->name, (30 * 20) - loop);
usleep(1000 * 1000 / 20);
}
}
/* read current database entry */
dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
- if (dev_old != NULL)
- udev_device_load_info(dev_old);
+ if (dev_old != NULL) {
+ udev_device_read_db(dev_old);
+ udev_device_set_info_loaded(dev_old);
+ }
/* update database, create node and symlinks */
udev_device_update_db(dev);
/* remove device node */
if (major(udev_device_get_devnum(dev)) != 0 && strcmp(udev_device_get_action(dev), "remove") == 0) {
/* import database entry and delete it */
- udev_device_load_info(dev);
+ udev_device_read_db(dev);
+ udev_device_set_info_loaded(dev);
udev_device_delete_db(dev);
if (udev_device_get_devnode(dev) == NULL) {