udevd: use libudev

[elogind.git] / udev / lib / libudev-device.c

diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index 5b90af68b89026a4cfdb362f2de5b6b852ea727d..65ba6e30d83ef736389d413578e6877473a5e9bb 100644 (file)
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -35,18 +35,21 @@ struct udev_device {
        int refcount;
        struct udev *udev;
        struct udev_device *parent_device;
+       int parent_set;
        char *syspath;
        const char *devpath;
        char *sysname;
        const char *sysnum;
        char *devnode;
        char *subsystem;
+       int subsystem_set;
        struct udev_list_node devlinks_list;
        int devlinks_uptodate;
        struct udev_list_node properties_list;
        char *envp[128];
        int envp_uptodate;
        char *driver;
+       int driver_set;
        dev_t devnum;
        char *action;
        int event_timeout;
@@ -72,7 +75,7 @@ static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *f
        return util_path_encode(&filename[start], len - start);
 }
 
-static int device_read_db(struct udev_device *udev_device)
+int udev_device_read_db(struct udev_device *udev_device)
 {
        struct stat stats;
        char filename[UTIL_PATH_SIZE];
@@ -217,7 +220,7 @@ static void device_load_info(struct udev_device *device)
 {
        device->info_loaded = 1;
        udev_device_read_uevent_file(device);
-       device_read_db(device);
+       udev_device_read_db(device);
 }
 
 void udev_device_set_info_loaded(struct udev_device *device)
@@ -228,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;
@@ -242,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;
 }
@@ -516,12 +525,12 @@ struct udev_device *udev_device_get_parent(struct udev_device *udev_device)
 {
        if (udev_device == NULL)
                return NULL;
-
-       if (udev_device->parent_device != NULL) {
-               info(udev_device->udev, "returning existing parent %p\n", udev_device->parent_device);
-               return udev_device->parent_device;
+       if (!udev_device->parent_set) {
+               udev_device->parent_set = 1;
+               udev_device->parent_device = device_new_from_parent(udev_device);
        }
-       udev_device->parent_device = device_new_from_parent(udev_device);
+       if (udev_device->parent_device != NULL)
+               info(udev_device->udev, "returning existing parent %p\n", udev_device->parent_device);
        return udev_device->parent_device;
 }
 
@@ -687,31 +696,30 @@ const char *udev_device_get_subsystem(struct udev_device *udev_device)
 
        if (udev_device == NULL)
                return NULL;
-       if (udev_device->subsystem != NULL)
-               return udev_device->subsystem;
-
-       /* read "subsytem" link */
-       if (util_get_sys_subsystem(udev_device->udev, udev_device->syspath, subsystem, sizeof(subsystem)) > 0) {
-               udev_device->subsystem = strdup(subsystem);
-               return udev_device->subsystem;
-       }
-
-       /* implicit names */
-       if (strncmp(udev_device->devpath, "/module/", 8) == 0) {
-               udev_device->subsystem = strdup("module");
-               return udev_device->subsystem;
-       }
-       if (strstr(udev_device->devpath, "/drivers/") != NULL) {
-               udev_device->subsystem = strdup("drivers");
-               return udev_device->subsystem;
-       }
-       if (strncmp(udev_device->devpath, "/subsystem/", 11) == 0 ||
-           strncmp(udev_device->devpath, "/class/", 7) == 0 ||
-           strncmp(udev_device->devpath, "/bus/", 5) == 0) {
-               udev_device->subsystem = strdup("subsystem");
-               return udev_device->subsystem;
+       if (!udev_device->subsystem_set) {
+               udev_device->subsystem_set = 1;
+               /* read "subsytem" link */
+               if (util_get_sys_subsystem(udev_device->udev, udev_device->syspath, subsystem, sizeof(subsystem)) > 0) {
+                       udev_device_set_subsystem(udev_device, subsystem);
+                       return udev_device->subsystem;
+               }
+               /* implicit names */
+               if (strncmp(udev_device->devpath, "/module/", 8) == 0) {
+                       udev_device_set_subsystem(udev_device, "module");
+                       return udev_device->subsystem;
+               }
+               if (strstr(udev_device->devpath, "/drivers/") != NULL) {
+                       udev_device_set_subsystem(udev_device, "drivers");
+                       return udev_device->subsystem;
+               }
+               if (strncmp(udev_device->devpath, "/subsystem/", 11) == 0 ||
+                   strncmp(udev_device->devpath, "/class/", 7) == 0 ||
+                   strncmp(udev_device->devpath, "/bus/", 5) == 0) {
+                       udev_device_set_subsystem(udev_device, "subsystem");
+                       return udev_device->subsystem;
+               }
        }
-       return NULL;
+       return udev_device->subsystem;
 }
 
 /**
@@ -784,11 +792,11 @@ const char *udev_device_get_driver(struct udev_device *udev_device)
 
        if (udev_device == NULL)
                return NULL;
-       if (udev_device->driver != NULL)
-               return udev_device->driver;
-       if (util_get_sys_driver(udev_device->udev, udev_device->syspath, driver, sizeof(driver)) < 2)
-               return NULL;
-       udev_device->driver = strdup(driver);
+       if (!udev_device->driver_set) {
+               udev_device->driver_set = 1;
+               if (util_get_sys_driver(udev_device->udev, udev_device->syspath, driver, sizeof(driver)) > 0)
+                       udev_device->driver = strdup(driver);
+       }
        return udev_device->driver;
 }
 
@@ -844,7 +852,8 @@ const char *udev_device_get_attr_value(struct udev_device *udev_device, const ch
        util_strlcat(path, attr, sizeof(path));
 
        if (lstat(path, &statbuf) != 0) {
-               info(udev_device->udev, "stat '%s' failed: %m\n", path);
+               info(udev_device->udev, "no attribute '%s', keep negative entry\n", path);
+               udev_list_entry_add(udev_device->udev, &udev_device->attr_list, attr, NULL, 0, 0);
                goto out;
        }
 
@@ -938,6 +947,7 @@ int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsy
        udev_device->subsystem = strdup(subsystem);
        if (udev_device->subsystem == NULL)
                return -ENOMEM;
+       udev_device->subsystem_set = 1;
        udev_device_add_property(udev_device, "SUBSYSTEM", udev_device->subsystem);
        return 0;
 }
@@ -965,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);
 }
 
@@ -1013,7 +1032,7 @@ int udev_device_set_action(struct udev_device *udev_device, const char *action)
        udev_device->action = strdup(action);
        if (udev_device->action == NULL)
                return -ENOMEM;
-       udev_device_add_property(udev_device, "ACTION", action);
+       udev_device_add_property(udev_device, "ACTION", udev_device->action);
        return 0;
 }
 
@@ -1023,6 +1042,8 @@ int udev_device_set_driver(struct udev_device *udev_device, const char *driver)
        udev_device->driver = strdup(driver);
        if (udev_device->driver == NULL)
                return -ENOMEM;
+       udev_device->driver_set = 1;
+       udev_device_add_property(udev_device, "DRIVER", udev_device->driver);
        return 0;
 }
 
@@ -1036,6 +1057,7 @@ int udev_device_set_devpath_old(struct udev_device *udev_device, const char *dev
        udev_device->devpath_old = strdup(devpath_old);
        if (udev_device->devpath_old == NULL)
                return -ENOMEM;
+       udev_device_add_property(udev_device, "DEVPATH_OLD", udev_device->devpath_old);
        return 0;
 }
 
@@ -1077,13 +1099,24 @@ int udev_device_set_event_timeout(struct udev_device *udev_device, int event_tim
 
 int udev_device_set_seqnum(struct udev_device *udev_device, unsigned long long int seqnum)
 {
+       char num[32];
+
        udev_device->seqnum = seqnum;
+       snprintf(num, sizeof(num), "%llu", seqnum);
+       udev_device_add_property(udev_device, "SEQNUM", num);
        return 0;
 }
 
 int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
 {
+       char num[32];
+
        udev_device->devnum = devnum;
+
+       snprintf(num, sizeof(num), "%u", major(devnum));
+       udev_device_add_property(udev_device, "MAJOR", num);
+       snprintf(num, sizeof(num), "%u", minor(devnum));
+       udev_device_add_property(udev_device, "MINOR", num);
        return 0;
 }