X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=b668655f29ec21e6a739c9dbdee65bd1ae48592e;hp=930a7be0ae17582a6d324a575c2cab12da485c1c;hb=2d8af104e0262554be2bf2cbbaa752bee6f1a65a;hpb=3810823b4410e0bfbaa46e5e63e36a0989ba37f3

diff --git a/udevinfo.c b/udevinfo.c
index 930a7be0a..b668655f2 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -1,7 +1,7 @@
 /*
- * udevinfo - fetches attributes for a device
+ * udevinfo.c - fetches stored device information or sysfs attributes
  *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -27,7 +27,6 @@
 #include <errno.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
-#include "libsysfs/dlist.h"
 #include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
@@ -37,12 +36,15 @@
 
 
 #ifdef USE_LOG
-void log_message (int level, const char *format, ...)
+void log_message (int priority, const char *format, ...)
 {
 	va_list	args;
 
+	if (priority > udev_log_priority)
+		return;
+
 	va_start(args, format);
-	vsyslog(level, format, args);
+	vsyslog(priority, format, args);
 	va_end(args);
 }
 #endif
@@ -51,35 +53,34 @@ static void print_all_attributes(struct dlist *attr_list)
 {
 	struct sysfs_attribute *attr;
 	char value[VALUE_SIZE];
-	int len;
+	size_t len;
 
 	dlist_for_each_data(attr_list, attr, struct sysfs_attribute) {
-		if (attr->value != NULL) {
-			strlcpy(value, attr->value, sizeof(value));
-			len = strlen(value);
-			if (len == 0)
-				continue;
-
-			/* remove trailing newline */
-			if (value[len-1] == '\n') {
-				value[len-1] = '\0';
-				len--;
-			}
+		if (attr->value == NULL)
+			continue;
+		len = strlcpy(value, attr->value, sizeof(value));
+		if (len >= sizeof(value)) {
+			dbg("attribute value of '%s' too long, skip", attr->name);
+			continue;
+		}
 
-			/* skip nonprintable values */
-			while (len) {
-				if (isprint(value[len-1]) == 0)
-					break;
-				len--;
-			}
-			if (len == 0)
-				printf("    SYSFS{%s}=\"%s\"\n", attr->name, value);
+		/* remove trailing newlines */
+		while (len && value[len-1] == '\n')
+			value[--len] = '\0';
+		/* skip nonprintable attributes */
+		while (len && isprint(value[len-1]))
+			len--;
+		if (len) {
+			dbg("attribute value of '%s' non-printable, skip", attr->name);
+			continue;
 		}
+		replace_untrusted_chars(value);
+		printf("    SYSFS{%s}==\"%s\"\n", attr->name, value);
 	}
 	printf("\n");
 }
 
-static int print_record(struct udevice *udev)
+static void print_record(struct udevice *udev)
 {
 	struct name_entry *name_loop;
 
@@ -87,32 +88,23 @@ 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);
-
-	return 0;
+	list_for_each_entry(name_loop, &udev->env_list, node)
+		printf("E: %s\n", name_loop->name);
 }
 
-enum query_type {
-	NONE,
-	NAME,
-	PATH,
-	SYMLINK,
-	ALL,
-};
-
 static int print_device_chain(const char *path)
 {
 	struct sysfs_class_device *class_dev;
 	struct sysfs_class_device *class_dev_parent;
 	struct sysfs_attribute *attr;
 	struct sysfs_device *sysfs_dev;
-	struct sysfs_device *sysfs_dev_parent;
 	struct dlist *attr_list;
 	int retval = 0;
 
 	/*  get the class dev */
 	class_dev = sysfs_open_class_device_path(path);
 	if (class_dev == NULL) {
-		printf("couldn't get the class device\n");
+		fprintf(stderr, "couldn't get the class device\n");
 		return -1;
 	}
 
@@ -130,11 +122,12 @@ 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);
+	printf("    KERNEL==\"%s\"\n", class_dev->name);
+	printf("    SUBSYSTEM==\"%s\"\n", class_dev->classname);
 
 	attr_list = sysfs_get_classdev_attributes(class_dev);
 	if (attr_list == NULL) {
-		printf("couldn't open class device directory\n");
+		fprintf(stderr, "couldn't open class device directory\n");
 		retval = -1;
 		goto exit;
 	}
@@ -142,36 +135,30 @@ static int print_device_chain(const char *path)
 
 	/* get the device link (if parent exists look here) */
 	class_dev_parent = sysfs_get_classdev_parent(class_dev);
-	if (class_dev_parent != NULL) 
+	if (class_dev_parent != NULL)
 		sysfs_dev = sysfs_get_classdev_device(class_dev_parent);
 	else 
 		sysfs_dev = sysfs_get_classdev_device(class_dev);
 	
 	if (sysfs_dev != NULL)
-		printf("follow the class device's \"device\"\n");
+		printf("follow the \"device\"-link to the physical device:\n");
 
 	/* look the device chain upwards */
 	while (sysfs_dev != NULL) {
-		attr_list = sysfs_get_device_attributes(sysfs_dev);
-		if (attr_list == NULL) {
-			printf("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);
+		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(attr_list);
+		attr_list = sysfs_get_device_attributes(sysfs_dev);
+		if (attr_list != NULL)
+			print_all_attributes(attr_list);
+		else
+			printf("\n");
 
-		sysfs_dev_parent = sysfs_get_device_parent(sysfs_dev);
-		if (sysfs_dev_parent == NULL)
+		sysfs_dev = sysfs_get_device_parent(sysfs_dev);
+		if (sysfs_dev == NULL)
 			break;
-
-		sysfs_dev = sysfs_dev_parent;
 	}
 
 exit:
@@ -179,19 +166,75 @@ 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 export_name_devpath(struct udevice *udev) {
+	printf("%s=%s/%s\n", udev->devpath, udev_root, udev->name);
+}
+
+static void export_record(struct udevice *udev) {
+	print_record(udev);
+	printf("\n");
+}
+
+static void export_db(void fnct(struct udevice *udev)) {
+	LIST_HEAD(name_list);
+	struct name_entry *name_loop;
+
+	udev_db_get_all_entries(&name_list);
+	list_for_each_entry(name_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)
+			fnct(&udev_db);
+		udev_cleanup_device(&udev_db);
+	}
+	name_list_cleanup(&name_list);
+}
+
+static void print_help(void)
+{
+	fprintf(stderr, "Usage: udevinfo [-anpqrVh]\n"
+	       "  -q TYPE  query database for the specified value:\n"
+	       "             '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"
+	       "  -n NAME  node/symlink name used for query\n"
+	       "\n"
+	       "  -r       prepend to query result or print udev_root\n"
+	       "  -a       print all SYSFS_attributes along the device chain\n"
+	       "  -e       export the content of the udev database\n"
+	       "  -V       print udev version\n"
+	       "  -h       print this help text\n"
+	       "\n");
 }
 
 int main(int argc, char *argv[], char *envp[])
 {
-	static const char short_options[] = "adn:p:q:rVh";
+	static const char short_options[] = "aden:p:q:rVh";
 	int option;
 	struct udevice udev;
 	int root = 0;
-	int attributes = 0;
-	enum query_type query = NONE;
+
+	enum action_type {
+		ACTION_NONE,
+		ACTION_QUERY,
+		ACTION_ATTRIBUTE_WALK,
+		ACTION_ROOT,
+	} action = ACTION_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];
@@ -202,7 +245,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) {
@@ -216,65 +259,65 @@ int main(int argc, char *argv[], char *envp[])
 			dbg("udev name: %s\n", optarg);
 			strlcpy(name, optarg, sizeof(name));
 			break;
-
 		case 'p':
 			dbg("udev path: %s\n", optarg);
 			strlcpy(path, optarg, sizeof(path));
 			break;
-
 		case 'q':
 			dbg("udev query: %s\n", optarg);
-
+			action = ACTION_QUERY;
 			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;
 			}
-
-			printf("unknown query type\n");
-			retval = 1;
+			fprintf(stderr, "unknown query type\n");
+			retval = 2;
 			goto exit;
-
 		case 'r':
+			if (action == ACTION_NONE)
+				action = ACTION_ROOT;
 			root = 1;
 			break;
-
 		case 'a':
-			attributes = 1;
+			action = ACTION_ATTRIBUTE_WALK;
 			break;
-
 		case 'd':
-			udev_db_dump_names(print_dump);
+			export_db(export_name_devpath);
+			goto exit;
+		case 'e':
+			export_db(export_record);
 			goto exit;
-
 		case 'V':
 			printf("udevinfo, version %s\n", UDEV_VERSION);
 			goto exit;
-
 		case 'h':
-			retval = 2;
 		case '?':
 		default:
-			goto help;
+			print_help();
+			goto exit;
 		}
 	}
 
-	/* process options */
-	if (query != NONE) {
+	/* run action */
+	switch (action) {
+	case ACTION_QUERY:
+		/* need devpath or node/symlink name for query */
 		if (path[0] != '\0') {
 			/* remove sysfs_path if given */
 			if (strncmp(path, sysfs_path, strlen(sysfs_path)) == 0) {
@@ -291,13 +334,11 @@ int main(int argc, char *argv[], char *envp[])
 			}
 			retval = udev_db_get_device(&udev, pos);
 			if (retval != 0) {
-				printf("device not found in database\n");
+				fprintf(stderr, "no record for '%s' in database\n", pos);
+				retval = 3;
 				goto exit;
 			}
-			goto print;
-		}
-
-		if (name[0] != '\0') {
+		} else if (name[0] != '\0') {
 			char devpath[PATH_SIZE];
 			int len;
 
@@ -308,30 +349,29 @@ int main(int argc, char *argv[], char *envp[])
 			} else
 				pos = name;
 
-			retval = udev_db_search_name(devpath, sizeof(devpath), pos);
+			retval = udev_db_lookup_name(pos, devpath, sizeof(devpath));
 			if (retval != 0) {
-				printf("device not found in database\n");
+				fprintf(stderr, "no record for '%s' in database\n", pos);
+				retval = 3;
 				goto exit;
 			}
 			udev_db_get_device(&udev, devpath);
-			goto print;
+		} else {
+			fprintf(stderr, "query needs device path(-p) or node name(-n) specified\n");
+			retval = 4;
+			goto exit;
 		}
 
-		printf("query needs device path(-p) or node name(-n) specified\n");
-		retval = 3;
-		goto exit;
-
-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:
+			break;
+		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);
@@ -339,21 +379,25 @@ print:
 				list_for_each_entry(name_loop, &udev.symlink_list, node)
 					printf("%s ", name_loop->name);
 			printf("\n");
-			goto exit;
-		case PATH:
+			break;
+		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);
+			break;
+		case QUERY_ALL:
 			print_record(&udev);
-			goto exit;
+			break;
 		default:
-			goto help;
+			print_help();
+			break;
 		}
-	}
-
-	if (attributes) {
+		break;
+	case ACTION_ATTRIBUTE_WALK:
 		if (path[0] == '\0') {
-			printf("attribute walk on device chain needs path(-p) specified\n");
+			fprintf(stderr, "attribute walk on device chain needs path(-p) specified\n");
 			retval = 4;
 			goto exit;
 		} else {
@@ -364,34 +408,17 @@ print:
 				strlcpy(path, temp, sizeof(temp));
 			}
 			print_device_chain(path);
-			goto exit;
 		}
-	}
-
-	if (root) {
+		break;
+	case ACTION_ROOT:
 		printf("%s\n", udev_root);
-		goto exit;
+		break;
+	default:
+		print_help();
+		retval = 1;
+		break;
 	}
 
-help:
-	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"
-	       "             'path'    sysfs device path\n"
-	       "             'all'     all values\n"
-	       "\n"
-	       "  -p PATH  sysfs device path used for query or chain\n"
-	       "  -n NAME  node/symlink name used for query\n"
-	       "\n"
-	       "  -r       print udev root\n"
-	       "  -a       print all SYSFS_attributes along the device chain\n"
-	       "  -d       print the relationship of devpath and the node name for all\n"
-	       "           devices available in the database\n"
-	       "  -V       print udev version\n"
-	       "  -h       print this help text\n"
-	       "\n");
-
 exit:
 	udev_cleanup_device(&udev);
 	logging_close();