X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=58584d62f807d5851ff4df0e6e701d760f28e176;hp=69e5335b7cef9d26d099c72c8bf45adadac0c483;hb=a1ea706a1e3dfa1bb86ebcfcd0b819311526b2e2;hpb=972d318a3123b00d0ed6b78bbcf70a0965841a8e

diff --git a/udevinfo.c b/udevinfo.c
index 69e5335b7..58584d62f 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>
  *
@@ -92,14 +92,6 @@ static int print_record(struct udevice *udev)
 	return 0;
 }
 
-enum query_type {
-	NONE,
-	NAME,
-	PATH,
-	SYMLINK,
-	ALL,
-};
-
 static int print_device_chain(const char *path)
 {
 	struct sysfs_class_device *class_dev;
@@ -185,7 +177,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];
@@ -220,22 +219,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;
 			}
 
@@ -268,7 +272,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) {
@@ -285,7 +289,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;
@@ -317,15 +321,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);
@@ -334,10 +338,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:
@@ -373,6 +381,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"