X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=fe847b875f0d08406db8bdf1544e62f952fd2f7d;hp=8fab86ca8c95e9bd80a088181bc660b9d5c93b53;hb=b1e95455d2683f43f47ea94a7b79af64f0738d36;hpb=3bdef3939d6501b26dac82fdc6f8e74d854a1f14

diff --git a/udevinfo.c b/udevinfo.c
index 8fab86ca8..fe847b875 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -30,16 +30,13 @@
 #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"
-#include "udevdb.h"
 
 
-# define SYSFS_VALUE_MAX 200
-
-char **main_argv;
-int main_argc;
+#define SYSFS_VALUE_SIZE		256
 
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
@@ -58,7 +55,7 @@ static int print_all_attributes(const char *path)
 	struct dlist *attributes;
 	struct sysfs_attribute *attr;
 	struct sysfs_directory *sysfs_dir;
-	char value[SYSFS_VALUE_MAX];
+	char value[SYSFS_VALUE_SIZE];
 	int len;
 	int retval = 0;
 
@@ -128,10 +125,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);
@@ -147,16 +140,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);
@@ -212,7 +199,7 @@ static int print_sysfs_devices(void)
 		struct dlist *class_devices;
 		struct sysfs_class_device *class_dev;
 		struct sysfs_device *phys_dev;
-		struct sysfs_driver *driver;
+		unsigned int major, minor;
 
 		cls = sysfs_open_class(class);
 		if (!cls)
@@ -231,23 +218,19 @@ static int print_sysfs_devices(void)
 
 			attr = sysfs_get_classdev_attr(class_dev, "dev");
 			if (attr) {
-				char *pos = &(attr->value[strlen(attr->value)-1]);
-
-				if  (pos[0] == '\n')
-					pos[0] = '\0';
-
-				printf("DEVMAJORMINOR  '%s'\n", attr->value);
+				sscanf(attr->value, "%u:%u", &major, &minor);
+				printf("MAJOR          %u\n", minor);
+				printf("MINOR          %u\n", major);
 			}
 
-			driver = sysfs_get_classdev_driver(class_dev);
-			if (driver)
-				printf("DEVDRIVER      '%s'\n", driver->name);
-
 			phys_dev = sysfs_get_classdev_device(class_dev);
 			if (phys_dev) {
 				printf("PHYSDEVPATH    '%s'\n", phys_dev->path);
 				if (phys_dev->bus[0] != '\0')
 					printf("PHYSDEVBUS     '%s'\n", phys_dev->bus);
+
+				if (phys_dev->driver_name[0] != '\0')
+					printf("PHYSDEVDRIVER  '%s'\n", phys_dev->driver_name);
 			}
 		}
 		sysfs_close_class(cls);
@@ -257,7 +240,7 @@ static int print_sysfs_devices(void)
 	return 0;
 }
 
-static int process_options(void)
+static int process_options(int argc, char *argv[])
 {
 	static const char short_options[] = "adn:p:q:rsVh";
 	int option;
@@ -266,7 +249,7 @@ static int process_options(void)
 	int root = 0;
 	int attributes = 0;
 	enum query_type query = NONE;
-	char result[NAME_SIZE] = "";
+	char result[1024] = "";
 	char path[NAME_SIZE] = "";
 	char name[NAME_SIZE] = "";
 	char temp[NAME_SIZE];
@@ -274,7 +257,7 @@ static int process_options(void)
 
 	/* get command line options */
 	while (1) {
-		option = getopt(main_argc, main_argv, short_options);
+		option = getopt(argc, argv, short_options);
 		if (option == -1)
 			break;
 
@@ -358,7 +341,7 @@ static int process_options(void)
 			}
 			memset(&udev, 0x00, sizeof(struct udevice));
 			strfieldcpy(udev.devpath, pos);
-			retval = udevdb_get_dev(&udev);
+			retval = udev_db_get_device(&udev);
 			if (retval != 0) {
 				printf("device not found in database\n");
 				goto exit;
@@ -377,7 +360,7 @@ static int process_options(void)
 
 			memset(&udev, 0x00, sizeof(struct udevice));
 			strfieldcpy(udev.name, pos);
-			retval = udevdb_get_dev_byname(&udev, pos);
+			retval = udev_db_get_device_byname(&udev, pos);
 			if (retval != 0) {
 				printf("device not found in database\n");
 				goto exit;
@@ -401,7 +384,20 @@ print:
 			break;
 
 		case SYMLINK:
-			strfieldcpy(result, udev.symlink);
+			if (root) {
+				int slen;
+				char *spos;
+				char slink[NAME_SIZE];
+
+				pos = result;
+				foreach_strpart(udev.symlink, " \n\r", spos, slen) {
+					strncpy(slink, spos, slen);
+					slink[slen] = '\0';
+					pos += sprintf(pos, "%s/%s ", udev_root, slink);
+				}
+			} else {
+				strfieldcpy(result, udev.symlink);
+			}
 			break;
 
 		case PATH:
@@ -466,15 +462,12 @@ int main(int argc, char *argv[], char *envp[])
 {
 	int rc = 0;
 
-	main_argv = argv;
-	main_argc = argc;
-
 	logging_init("udevinfo");
 
 	/* initialize our configuration */
 	udev_init_config();
 
-	rc = process_options();
+	rc = process_options(argc, argv);
 
 	logging_close();
 	exit(rc);