[PATCH] add /etc/dev.d/ support for udev add and remove events.

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index 5ad9e64746f5fb0b8e2623aa2117ba961ca1bdef..800882eb1aa4b2d077bc7315d41a448e77c99e2b 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -112,6 +112,9 @@ static int print_record(char *path, struct udevice *dev)
        printf("S: %s\n", dev->symlink);
        printf("O: %s\n", dev->owner);
        printf("G: %s\n", dev->group);
+       printf("F: %s\n", dev->config_file);
+       printf("L: %i\n", dev->config_line);
+       printf("T: %li\n", dev->config_time);
        printf("\n");
        return 0;
 }
@@ -158,7 +161,6 @@ static int print_device_chain(const char *path)
               "to match the device for which the node will be created.\n"
               "\n");
        printf("device '%s' has major:minor %s", class_dev->path, attr->value);
-       sysfs_close_attribute(attr);
 
        /* open sysfs class device directory and print all attributes */
        printf("  looking at class device '%s':\n", class_dev->path);
@@ -170,11 +172,11 @@ static int print_device_chain(const char *path)
 
        /* get the device link (if parent exists look here) */
        class_dev_parent = sysfs_get_classdev_parent(class_dev);
-       if (class_dev_parent != NULL) {
-               //sysfs_close_class_device(class_dev);
-               class_dev = class_dev_parent;
-       }
-       sysfs_dev = sysfs_get_classdev_device(class_dev);
+       if (class_dev_parent != NULL) 
+               sysfs_dev = sysfs_get_classdev_device(class_dev_parent);
+       else 
+               sysfs_dev = sysfs_get_classdev_device(class_dev);
+       
        if (sysfs_dev != NULL)
                printf("follow the class device's \"device\"\n");
 
@@ -191,13 +193,11 @@ static int print_device_chain(const char *path)
                if (sysfs_dev_parent == NULL)
                        break;
 
-               //sysfs_close_device(sysfs_dev);
                sysfs_dev = sysfs_dev_parent;
        }
-       sysfs_close_device(sysfs_dev);
 
 exit:
-       //sysfs_close_class_device(class_dev);
+       sysfs_close_class_device(class_dev);
        return retval;
 }