libudev: enumerate - allow to filter-out not-already-initialized devices

[elogind.git] / libudev / libudev-device-private.c

diff --git a/libudev/libudev-device-private.c b/libudev/libudev-device-private.c
index 430e3e64d4dbe74049515bad6e3c19324cccb3c8..d1df45ee742506a4a8d74d1158999db7237a62d9 100644 (file)
--- a/libudev/libudev-device-private.c
+++ b/libudev/libudev-device-private.c
@@ -89,6 +89,9 @@ static bool device_has_info(struct udev_device *udev_device)
                        return true;
        if (udev_device_get_tags_list_entry(udev_device) != NULL)
                return true;
+       if (udev_device_get_knodename(udev_device) != NULL)
+               if (strcmp(udev_device_get_devnode(udev_device), udev_device_get_knodename(udev_device)) != 0)
+                       return true;
        if (udev_device_get_watch_handle(udev_device) >= 0)
                return true;
        return false;
@@ -102,7 +105,6 @@ int udev_device_update_db(struct udev_device *udev_device)
        char filename[UTIL_PATH_SIZE];
        char filename_tmp[UTIL_PATH_SIZE];
        FILE *f;
-       size_t devlen = strlen(udev_get_dev_path(udev))+1;
 
        id = udev_device_get_id_filename(udev_device);
        if (id == NULL)
@@ -112,7 +114,9 @@ int udev_device_update_db(struct udev_device *udev_device)
        util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db/", id, NULL);
 
        /* do not store anything for otherwise empty devices */
-       if (!has_info && udev_device_get_devnode(udev_device) == NULL) {
+       if (!has_info &&
+           major(udev_device_get_devnum(udev_device)) == 0 &&
+           udev_device_get_ifindex(udev_device) == 0) {
                unlink(filename);
                return 0;
        }
@@ -127,6 +131,7 @@ int udev_device_update_db(struct udev_device *udev_device)
        }
 
        if (has_info) {
+               size_t devlen = strlen(udev_get_dev_path(udev))+1;
                struct udev_list_entry *list_entry;
 
                if (udev_device_get_devnode(udev_device) != NULL) {