X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevinfo.c;h=11b0104581aa0e0ea8a8059fd17ddcf440d9b9d6;hb=64d735e652e949dae5bcaf2bd2004a2d67e627cf;hp=788dd519a86e97cdf7e2d8d6cbac398189773a6a;hpb=6276fdd2ab9c0cbfd0fba3e0261a074e81932156;p=elogind.git

diff --git a/udevinfo.c b/udevinfo.c
index 788dd519a..11b010458 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -1,5 +1,5 @@
 /*
- * udevinfo - fetches attributes for a device
+ * udevinfo.c - fetches attributes for a device
  *
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
@@ -88,18 +88,12 @@ static int print_record(struct udevice *udev)
 	printf("N: %s\n", udev->name);
 	list_for_each_entry(name_loop, &udev->symlink_list, node)
 		printf("S: %s\n", name_loop->name);
+	list_for_each_entry(name_loop, &udev->env_list, node)
+		printf("E: %s\n", name_loop->name);
 
 	return 0;
 }
 
-enum query_type {
-	NONE,
-	NAME,
-	PATH,
-	SYMLINK,
-	ALL,
-};
-
 static int print_device_chain(const char *path)
 {
 	struct sysfs_class_device *class_dev;
@@ -152,19 +146,16 @@ static int print_device_chain(const char *path)
 
 	/* look the device chain upwards */
 	while (sysfs_dev != NULL) {
-		attr_list = sysfs_get_device_attributes(sysfs_dev);
-		if (attr_list == NULL) {
-			fprintf(stderr, "couldn't open device directory\n");
-			retval = -1;
-			goto exit;
-		}
-
 		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);
 
-		print_all_attributes(attr_list);
+		attr_list = sysfs_get_device_attributes(sysfs_dev);
+		if (attr_list != NULL)
+			print_all_attributes(attr_list);
+		else
+			printf("\n");
 
 		sysfs_dev = sysfs_get_device_parent(sysfs_dev);
 		if (sysfs_dev == NULL)
@@ -176,9 +167,22 @@ exit:
 	return retval;
 }
 
-static int print_dump(const char *devpath, const char *name) {
-	printf("%s=%s/%s\n", devpath, udev_root, name);
-	return 0;
+static void dump_names(void) {
+	LIST_HEAD(name_list);
+	struct name_entry *name_loop;
+	struct name_entry *tmp_loop;
+
+	udev_db_get_all_entries(&name_list);
+	list_for_each_entry_safe(name_loop, tmp_loop, &name_list, node) {
+		struct udevice udev_db;
+
+		udev_init_device(&udev_db, NULL, NULL, NULL);
+		if (udev_db_get_device(&udev_db, name_loop->name) == 0) {
+			printf("%s=%s/%s\n", udev_db.devpath, udev_root, udev_db.name);
+			free(name_loop);
+		}
+		udev_cleanup_device(&udev_db);
+	}
 }
 
 int main(int argc, char *argv[], char *envp[])
@@ -188,7 +192,14 @@ int main(int argc, char *argv[], char *envp[])
 	struct udevice udev;
 	int root = 0;
 	int attributes = 0;
-	enum query_type query = NONE;
+	enum query_type {
+		QUERY_NONE,
+		QUERY_NAME,
+		QUERY_PATH,
+		QUERY_SYMLINK,
+		QUERY_ENV,
+		QUERY_ALL,
+	} query = QUERY_NONE;
 	char path[PATH_SIZE] = "";
 	char name[PATH_SIZE] = "";
 	char temp[PATH_SIZE];
@@ -199,7 +210,7 @@ int main(int argc, char *argv[], char *envp[])
 	logging_init("udevinfo");
 
 	udev_init_config();
-	udev_init_device(&udev, NULL, NULL);
+	udev_init_device(&udev, NULL, NULL, NULL);
 
 	/* get command line options */
 	while (1) {
@@ -223,22 +234,27 @@ int main(int argc, char *argv[], char *envp[])
 			dbg("udev query: %s\n", optarg);
 
 			if (strcmp(optarg, "name") == 0) {
-				query = NAME;
+				query = QUERY_NAME;
 				break;
 			}
 
 			if (strcmp(optarg, "symlink") == 0) {
-				query = SYMLINK;
+				query = QUERY_SYMLINK;
 				break;
 			}
 
 			if (strcmp(optarg, "path") == 0) {
-				query = PATH;
+				query = QUERY_PATH;
+				break;
+			}
+
+			if (strcmp(optarg, "env") == 0) {
+				query = QUERY_ENV;
 				break;
 			}
 
 			if (strcmp(optarg, "all") == 0) {
-				query = ALL;
+				query = QUERY_ALL;
 				break;
 			}
 
@@ -255,7 +271,7 @@ int main(int argc, char *argv[], char *envp[])
 			break;
 
 		case 'd':
-			udev_db_dump_names(print_dump);
+			dump_names();
 			goto exit;
 
 		case 'V':
@@ -271,7 +287,7 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 	/* process options */
-	if (query != NONE) {
+	if (query != QUERY_NONE) {
 		if (path[0] != '\0') {
 			/* remove sysfs_path if given */
 			if (strncmp(path, sysfs_path, strlen(sysfs_path)) == 0) {
@@ -288,7 +304,7 @@ int main(int argc, char *argv[], char *envp[])
 			}
 			retval = udev_db_get_device(&udev, pos);
 			if (retval != 0) {
-				fprintf(stderr, "device not found in database\n");
+				fprintf(stderr, "no record for '%s' in database\n", pos);
 				goto exit;
 			}
 			goto print;
@@ -307,7 +323,7 @@ int main(int argc, char *argv[], char *envp[])
 
 			retval = udev_db_search_name(devpath, sizeof(devpath), pos);
 			if (retval != 0) {
-				fprintf(stderr, "device not found in database\n");
+				fprintf(stderr, "no record for '%s' in database\n", pos);
 				goto exit;
 			}
 			udev_db_get_device(&udev, devpath);
@@ -320,15 +336,15 @@ int main(int argc, char *argv[], char *envp[])
 
 print:
 		switch(query) {
-		case NAME:
+		case QUERY_NAME:
 			if (root)
 				printf("%s/%s\n", udev_root, udev.name);
 			else
 				printf("%s\n", udev.name);
 			goto exit;
-		case SYMLINK:
+		case QUERY_SYMLINK:
 			if (list_empty(&udev.symlink_list))
-				break;
+				goto exit;
 			if (root)
 				list_for_each_entry(name_loop, &udev.symlink_list, node)
 					printf("%s/%s ", udev_root, name_loop->name);
@@ -337,10 +353,14 @@ print:
 					printf("%s ", name_loop->name);
 			printf("\n");
 			goto exit;
-		case PATH:
+		case QUERY_PATH:
 			printf("%s\n", udev.devpath);
 			goto exit;
-		case ALL:
+		case QUERY_ENV:
+			list_for_each_entry(name_loop, &udev.env_list, node)
+				printf("%s\n", name_loop->name);
+			goto exit;
+		case QUERY_ALL:
 			print_record(&udev);
 			goto exit;
 		default:
@@ -376,6 +396,7 @@ help:
 	       "             'name'    name of device node\n"
 	       "             'symlink' pointing to node\n"
 	       "             'path'    sysfs device path\n"
+	       "             'env'     the device related imported environment\n"
 	       "             'all'     all values\n"
 	       "\n"
 	       "  -p PATH  sysfs device path used for query or chain\n"