summaryrefslogtreecommitdiff
path: root/udev
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-10-16 13:53:16 +0200
committerKay Sievers <kay.sievers@vrfy.org>2008-10-16 13:53:16 +0200
commitebacd6ecc301cb4cdacd1a18f6514c4a839f5999 (patch)
treeabc15bad347b27da8ec397daf6c662128f3eaea9 /udev
parentf183b6ed766a18835d53dc1e36a4e98756ebd0b7 (diff)
libudev: device - copy global properties, unset empty properties
Diffstat (limited to 'udev')
-rw-r--r--udev/lib/libudev-device.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index acab263785..daf2217765 100644
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -231,6 +231,7 @@ void udev_device_set_info_loaded(struct udev_device *device)
struct udev_device *device_new(struct udev *udev)
{
struct udev_device *udev_device;
+ struct udev_list_entry *list_entry;
if (udev == NULL)
return NULL;
@@ -245,6 +246,11 @@ struct udev_device *device_new(struct udev *udev)
udev_list_init(&udev_device->properties_list);
udev_list_init(&udev_device->attr_list);
udev_device->event_timeout = -1;
+ /* copy global properties */
+ udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
+ udev_device_add_property(udev_device,
+ udev_list_entry_get_name(list_entry),
+ udev_list_entry_get_value(list_entry));
info(udev_device->udev, "udev_device: %p created\n", udev_device);
return udev_device;
}
@@ -969,6 +975,15 @@ int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink
struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value)
{
udev_device->envp_uptodate = 0;
+ if (value == NULL) {
+ struct udev_list_entry *list_entry;
+
+ list_entry = udev_device_get_properties_list_entry(udev_device);
+ list_entry = udev_list_entry_get_by_name(list_entry, key);
+ if (list_entry != NULL)
+ udev_list_entry_remove(list_entry);
+ return NULL;
+ }
return udev_list_entry_add(udev_device->udev, &udev_device->properties_list, key, value, 1, 0);
}