X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=00af081eacfc1fccde721cb711aef27e3c6011c0;hp=097c91c21b9db82839786d9f1fdcfa371b759fd3;hb=eb8700908c961d4a0197273f728bc3a3d6cd6c4a;hpb=e4ad54a302773d8b1c197e32fe67541f1b60518e

diff --git a/udevinfo.c b/udevinfo.c
index 097c91c21..00af081ea 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -30,7 +30,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "libsysfs/dlist.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "udev_db.h"
 #include "logging.h"
@@ -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;
@@ -125,10 +124,6 @@ static int print_device_chain(const char *path)
 	struct sysfs_device *sysfs_dev;
 	struct sysfs_device *sysfs_dev_parent;
 	int retval = 0;
-	char type;
-
-	type = get_device_type(path, "");
-	dbg("device type is %c", type);
 
 	/*  get the class dev */
 	class_dev = sysfs_open_class_device_path(path);
@@ -144,16 +139,10 @@ static int print_device_chain(const char *path)
 	       "to match the device for which the node will be created.\n"
 	       "\n");
 
-	if (type == 'b' || type =='c') {
-		/* read the 'dev' file for major/minor*/
-		attr = sysfs_get_classdev_attr(class_dev, "dev");
-		if (attr == NULL) {
-			printf("couldn't get the \"dev\" file\n");
-			retval = -1;
-			goto exit;
-		}
+	/* look for the 'dev' file */
+	attr = sysfs_get_classdev_attr(class_dev, "dev");
+	if (attr != NULL)
 		printf("device '%s' has major:minor %s", class_dev->path, attr->value);
-	}
 
 	/* open sysfs class device directory and print all attributes */
 	printf("  looking at class device '%s':\n", class_dev->path);
@@ -252,7 +241,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;
@@ -411,7 +400,7 @@ print:
 			break;
 
 		case PATH:
-			strfieldcpy(result, path);
+			strfieldcpy(result, udev.devpath);
 			break;
 
 		case ALL:
@@ -449,7 +438,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"