shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-27 10:25:37 +03:00
Code

libudev: introduce udev_device_properties_copy()

Browse Source 
To copy properties from one device to another. Drop the equivalent functionality from udevd.
This commit is contained in:
Tom Gundersen 2015-03-06 18:30:09 +01:00
parent 4db7e6d781
commit 1cd0a77022
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libudev/libudev-device.c
View File

@ -2030,3 +2030,18 @@ struct udev_device *udev_device_new_from_nulstr(struct udev *udev, char *nulstr,
return device;
}
int udev_device_copy_properties(struct udev_device *dst, struct udev_device *src) {
struct udev_list_entry *entry;
for ((entry = udev_device_get_properties_list_entry(src)); entry; entry = udev_list_entry_get_next(entry)) {
const char *key, *value;
key = udev_list_entry_get_name(entry);
value = udev_list_entry_get_value(entry);
udev_device_add_property(dst, key, value);
}
return 0;
}

1
src/libudev/libudev-private.h
View File

@ -39,6 +39,7 @@ int udev_get_rules_path(struct udev *udev, char **path[], usec_t *ts_usec[]);
/* libudev-device.c */
struct udev_device *udev_device_new_from_nulstr(struct udev *udev, char *nulstr, ssize_t buflen);
struct udev_device *udev_device_shallow_clone(struct udev_device *old_device);
int udev_device_copy_properties(struct udev_device *dst, struct udev_device *src);
mode_t udev_device_get_devnode_mode(struct udev_device *udev_device);
uid_t udev_device_get_devnode_uid(struct udev_device *udev_device);
gid_t udev_device_get_devnode_gid(struct udev_device *udev_device);

14
src/udev/udev-event.c
View File

@ -819,18 +819,8 @@ void udev_event_execute_rules(struct udev_event *event,
}
if (major(udev_device_get_devnum(dev)) == 0 &&
streq(udev_device_get_action(dev), "move")) {
struct udev_list_entry *entry;
for ((entry = udev_device_get_properties_list_entry(event->dev_db)); entry; entry = udev_list_entry_get_next(entry)) {
const char *key, *value;
key = udev_list_entry_get_name(entry);
value = udev_list_entry_get_value(entry);
udev_device_add_property(dev, key, value);
}
}
streq(udev_device_get_action(dev), "move"))
udev_device_copy_properties(dev, event->dev_db);
udev_rules_apply_to_event(rules, event,
timeout_usec, timeout_warn_usec,