X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=800882eb1aa4b2d077bc7315d41a448e77c99e2b;hp=b15f174e4032706d5c36fee31cadb8bc0fb0de50;hb=dd64e26b0c88892b367f57c4c7a7484e35641c7c;hpb=dba8c18b8b7b5f4c6d79593df8179c02a78d020f

diff --git a/udevinfo.c b/udevinfo.c
index b15f174e4..800882eb1 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -30,6 +30,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "libsysfs/dlist.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "udevdb.h"
@@ -41,7 +42,7 @@ char **main_argv;
 int main_argc;
 
 #ifdef LOG
-unsigned char logname[42];
+unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
 	va_list	args;
@@ -111,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;
 }
@@ -151,13 +155,12 @@ static int print_device_chain(const char *path)
 	}
 
 	printf("\nudevinfo starts with the device the node belongs to and then walks up the\n"
-	       "device chain to print for every device found all possibly useful attributes\n"
+	       "device chain, to print for every device found, all possibly useful attributes\n"
 	       "in the udev key format.\n"
-	       "Only attributes within one device section may be used in a rule to match the\n"
-	       "device for which the node will be created.\n"
+	       "Only attributes within one device section may be used together in one rule,\n"
+	       "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);
@@ -169,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");
 
@@ -190,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;
 }