X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=a6daf46be69f03cd5d37827c6950a07e86cfda5b;hp=6e6b9aeb3ed572e1b398ca0605f9845c8c4736fd;hb=f51d8ec66139fd907d971c64e951decdc20eeecb;hpb=9af5bb2f8fdbf54c064ddbd319d61092f28a4132;ds=sidebyside

diff --git a/udevinfo.c b/udevinfo.c
index 6e6b9aeb3..a6daf46be 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -39,7 +39,6 @@
 #define SYSFS_VALUE_SIZE		256
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
 	va_list	args;
@@ -147,6 +146,7 @@ static int print_device_chain(const char *path)
 
 	/* open sysfs class device directory and print all attributes */
 	printf("  looking at class device '%s':\n", class_dev->path);
+	printf("    SUBSYSTEM=\"%s\"\n", class_dev->classname);
 	if (print_all_attributes(class_dev->path) != 0) {
 		printf("couldn't open class device directory\n");
 		retval = -1;
@@ -168,6 +168,7 @@ static int print_device_chain(const char *path)
 		printf("  looking at the device chain at '%s':\n", sysfs_dev->path);
 		printf("    BUS=\"%s\"\n", sysfs_dev->bus);
 		printf("    ID=\"%s\"\n", sysfs_dev->bus_id);
+		printf("    DRIVER=\"%s\"\n", sysfs_dev->driver_name);
 
 		/* open sysfs device directory and print all attributes */
 		print_all_attributes(sysfs_dev->path);
@@ -219,8 +220,8 @@ static int print_sysfs_devices(void)
 			attr = sysfs_get_classdev_attr(class_dev, "dev");
 			if (attr) {
 				sscanf(attr->value, "%u:%u", &major, &minor);
-				printf("MAJOR          %u\n", minor);
-				printf("MINOR          %u\n", major);
+				printf("MAJOR          %u\n", major);
+				printf("MINOR          %u\n", minor);
 			}
 
 			phys_dev = sysfs_get_classdev_device(class_dev);
@@ -242,7 +243,7 @@ static int print_sysfs_devices(void)
 
 static int process_options(int argc, char *argv[])
 {
-	static const char short_options[] = "adn:p:q:rsVh";
+	static const char short_options[] = "an:p:q:rsVh";
 	int option;
 	int retval = 1;
 	struct udevice udev;
@@ -439,7 +440,7 @@ exit:
 	}
 
 help:
-	printf("Usage: [-anpqrdVh]\n"
+	printf("Usage: udevinfo [-anpqrVh]\n"
 	       "  -q TYPE  query database for the specified value:\n"
 	       "             'name'    name of device node\n"
 	       "             'symlink' pointing to node\n"