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_properties_list_entry(dev);
- util_strlcpy(string, udev_list_entry_get_name(list_entry), maxsize);
+ list_entry = udev_device_get_devlinks_list_entry(dev);
+ 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;
util_strlcat(filename, event->name, sizeof(filename));
udev_device_set_devnode(dev, filename);
- /* read current database entry; cleanup, if it is known device */
+ /* read current database entry */
dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
if (dev_old != NULL) {
- if (udev_device_get_devnode(dev_old) != NULL) {
- info(event->udev, "device node '%s' already in database, updating\n",
- udev_device_get_devnode(dev_old));
- udev_node_update_old_links(dev, dev_old, event->test);
- }
- udev_device_unref(dev_old);
+ udev_device_read_db(dev_old);
+ udev_device_set_info_loaded(dev_old);
}
+ /* update database, create node and symlinks */
udev_device_update_db(dev);
-
err = udev_node_add(dev, event->mode, event->uid, event->gid, event->test);
- if (err != 0)
- goto exit;
+ /* remove/update possible left-over symlinks from old database entry */
+ if (dev_old != NULL) {
+ udev_node_update_old_links(dev, dev_old, event->test);
+ udev_device_unref(dev_old);
+ }
goto exit;
}
if (major(udev_device_get_devnum(dev)) != 0 && strcmp(udev_device_get_action(dev), "remove") == 0) {
/* import database entry and delete it */
udev_device_read_db(dev);
- if (!event->test)
- udev_device_delete_db(dev);
+ udev_device_set_info_loaded(dev);
+ udev_device_delete_db(dev);
if (udev_device_get_devnode(dev) == NULL) {
char devnode[UTIL_PATH_SIZE];
util_strlcpy(program, cmd, sizeof(program));
udev_event_apply_format(event, program, sizeof(program));
if (event->trace)
- printf("run %s (%llu) '%s'\n",
+ fprintf(stderr, "run %s (%llu) '%s'\n",
udev_device_get_syspath(event->dev),
udev_device_get_seqnum(event->dev),
program);