X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=567193adc7f8949f229d74531b87dca7520a51cf;hp=d1dd663d8185a28eb668f058e64d63ab71811b50;hb=21dabee8a78bdde10bdb23bd3002c8aa09a161d3;hpb=61b1b7069f7a640e1952dce3c6de97034ef7c4fe

diff --git a/udevinfo.c b/udevinfo.c
index d1dd663d8..567193adc 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
@@ -21,18 +21,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <unistd.h>
+#include <dirent.h>
 #include <errno.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "udev_version.h"
-#include "udev_db.h"
-#include "logging.h"
 
 
 #ifdef USE_LOG
@@ -49,162 +45,184 @@ void log_message (int priority, const char *format, ...)
 }
 #endif
 
-static void print_all_attributes(struct dlist *attr_list)
+static void print_all_attributes(const char *devpath)
 {
-	struct sysfs_attribute *attr;
-	char value[VALUE_SIZE];
-	int 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)
+	char path[PATH_SIZE];
+	DIR *dir;
+	struct dirent *dent;
+
+	strlcpy(path, sysfs_path, sizeof(path));
+	strlcat(path, devpath, sizeof(path));
+
+	dir = opendir(path);
+	if (dir != NULL) {
+		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+			char *attr_value;
+			char value[NAME_SIZE];
+			size_t len;
+
+			attr_value = sysfs_attr_get_value(devpath, dent->d_name);
+			if (attr_value == NULL)
 				continue;
+			len = strlcpy(value, attr_value, sizeof(value));
+			dbg("attr '%s'='%s'(%zi)", dent->d_name, value, len);
 
-			/* remove trailing newline */
-			if (value[len-1] == '\n') {
-				value[len-1] = '\0';
-				len--;
-			}
+			/* remove trailing newlines */
+			while (len && value[len-1] == '\n')
+				value[--len] = '\0';
 
-			/* skip nonprintable values */
-			while (len) {
-				if (isprint(value[len-1]) == 0)
-					break;
+			/* skip nonprintable attributes */
+			while (len && isprint(value[len-1]))
 				len--;
+			if (len) {
+				dbg("attribute value of '%s' non-printable, skip", dent->d_name);
+				continue;
 			}
-			if (len == 0)
-				printf("    SYSFS{%s}==\"%s\"\n", attr->name, value);
+
+			replace_untrusted_chars(value);
+			printf("    SYSFS{%s}==\"%s\"\n", dent->d_name, value);
 		}
 	}
 	printf("\n");
 }
 
-static int print_record(struct udevice *udev)
+static int print_device_chain(const char *devpath)
 {
-	struct name_entry *name_loop;
+	struct sysfs_device *dev;
+
+	printf("\n"
+	       "Udevinfo starts with the device specified by the devpath and then\n"
+	       "walks up the chain of parent devices. It prints for every device\n"
+	       "found, all possible attributes in the udev rules key format.\n"
+	       "A rule to match, can be composed by the attributes of the device\n"
+	       "and the attributes from one single parent device.\n"
+	       "\n");
 
-	printf("P: %s\n", udev->devpath);
-	printf("N: %s\n", udev->name);
-	list_for_each_entry(name_loop, &udev->symlink_list, node)
-		printf("S: %s\n", name_loop->name);
+	dev = sysfs_device_get(devpath);
+	if (dev == NULL)
+		return -1;
 
-	return 0;
-}
+	printf("  looking at device '%s':\n", dev->devpath);
+	printf("    KERNEL==\"%s\"\n", dev->kernel_name);
+	printf("    SUBSYSTEM==\"%s\"\n", dev->subsystem);
+	print_all_attributes(dev->devpath);
 
-enum query_type {
-	NONE,
-	NAME,
-	PATH,
-	SYMLINK,
-	ALL,
-};
+	/* walk up the chain of devices */
+	while (1) {
+		dev = sysfs_device_get_parent(dev);
+		if (dev == NULL)
+			break;
+		printf("  looking at parent device '%s':\n", dev->devpath);
+		printf("    ID==\"%s\"\n", dev->kernel_name);
+		printf("    BUS==\"%s\"\n", dev->subsystem);
+		printf("    DRIVER==\"%s\"\n", dev->driver);
 
-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) {
-		fprintf(stderr, "couldn't get the class device\n");
-		return -1;
+		print_all_attributes(dev->devpath);
 	}
 
-	printf("\nudevinfo starts with the device the node belongs to and then walks up the\n"
-	       "device chain, to print for every device found, all possibly useful attributes\n"
-	       "in the udev key format.\n"
-	       "Only attributes within one device section may be used together in one rule,\n"
-	       "to match the device for which the node will be created.\n"
-	       "\n");
+	return 0;
+}
 
-	/* 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);
+static void print_record(struct udevice *udev)
+{
+	struct name_entry *name_loop;
 
-	/* 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("P: %s\n", udev->dev->devpath);
+	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);
+}
 
-	attr_list = sysfs_get_classdev_attributes(class_dev);
-	if (attr_list == NULL) {
-		fprintf(stderr, "couldn't open class device directory\n");
-		retval = -1;
-		goto exit;
-	}
-	print_all_attributes(attr_list);
-
-	/* get the device link (if parent exists look here) */
-	class_dev_parent = sysfs_get_classdev_parent(class_dev);
-	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");
-
-	/* 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;
-		}
+static void export_name_devpath(struct udevice *udev) {
+	printf("%s=%s/%s\n", udev->dev->devpath, udev_root, udev->name);
+}
 
-		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);
+static void export_record(struct udevice *udev) {
+	print_record(udev);
+	printf("\n");
+}
 
-		/* open sysfs device directory and print all attributes */
-		print_all_attributes(attr_list);
+static void export_db(void fnct(struct udevice *udev)) {
+	LIST_HEAD(name_list);
+	struct name_entry *name_loop;
 
-		sysfs_dev_parent = sysfs_get_device_parent(sysfs_dev);
-		if (sysfs_dev_parent == NULL)
-			break;
+	udev_db_get_all_entries(&name_list);
+	list_for_each_entry(name_loop, &name_list, node) {
+		struct udevice *udev_db;
 
-		sysfs_dev = sysfs_dev_parent;
+		udev_db = udev_device_init();
+		if (udev_db == NULL)
+			continue;
+		if (udev_db_get_device(udev_db, name_loop->name) == 0)
+			fnct(udev_db);
+		udev_device_cleanup(udev_db);
 	}
-
-exit:
-	sysfs_close_class_device(class_dev);
-	return retval;
+	name_list_cleanup(&name_list);
 }
 
-static int print_dump(const char *devpath, const char *name) {
-	printf("%s=%s/%s\n", devpath, udev_root, name);
-	return 0;
+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;
+	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];
 	struct name_entry *name_loop;
 	char *pos;
-	int retval = 0;
+	int rc = 0;
 
 	logging_init("udevinfo");
 
-	udev_init_config();
-	udev_init_device(&udev, NULL, NULL);
+	udev_config_init();
+	sysfs_init();
+
+	udev = udev_device_init();
+	if (udev == NULL) {
+		rc = 1;
+		goto exit;
+	}
 
 	/* get command line options */
 	while (1) {
@@ -218,65 +236,69 @@ 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));
+			/* remove sysfs mountpoint if not given */
+			if (strncmp(optarg, sysfs_path, strlen(sysfs_path)) == 0)
+				strlcpy(path, &optarg[strlen(sysfs_path)], sizeof(path));
+			else
+				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;
 			}
-
 			fprintf(stderr, "unknown query type\n");
-			retval = 1;
+			rc = 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,15 +313,12 @@ int main(int argc, char *argv[], char *envp[])
 					pos = path;
 				}
 			}
-			retval = udev_db_get_device(&udev, pos);
-			if (retval != 0) {
-				fprintf(stderr, "device not found in database\n");
+			if (udev_db_get_device(udev, pos) != 0) {
+				fprintf(stderr, "no record for '%s' in database\n", pos);
+				rc = 3;
 				goto exit;
 			}
-			goto print;
-		}
-
-		if (name[0] != '\0') {
+		} else if (name[0] != '\0') {
 			char devpath[PATH_SIZE];
 			int len;
 
@@ -310,92 +329,71 @@ int main(int argc, char *argv[], char *envp[])
 			} else
 				pos = name;
 
-			retval = udev_db_search_name(devpath, sizeof(devpath), pos);
-			if (retval != 0) {
-				fprintf(stderr, "device not found in database\n");
+			if (udev_db_lookup_name(pos, devpath, sizeof(devpath)) != 0) {
+				fprintf(stderr, "no record for '%s' in database\n", pos);
+				rc = 3;
 				goto exit;
 			}
-			udev_db_get_device(&udev, devpath);
-			goto print;
+			udev_db_get_device(udev, devpath);
+		} else {
+			fprintf(stderr, "query needs device path(-p) or node name(-n) specified\n");
+			rc = 4;
+			goto exit;
 		}
 
-		fprintf(stderr, "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);
+				printf("%s/%s\n", udev_root, udev->name);
 			else
-				printf("%s\n", udev.name);
-			goto exit;
-		case SYMLINK:
-			if (list_empty(&udev.symlink_list))
-				break;
+				printf("%s\n", udev->name);
+			break;
+		case QUERY_SYMLINK:
+			if (list_empty(&udev->symlink_list))
+				goto exit;
 			if (root)
-				list_for_each_entry(name_loop, &udev.symlink_list, node)
+				list_for_each_entry(name_loop, &udev->symlink_list, node)
 					printf("%s/%s ", udev_root, name_loop->name);
 			else
-				list_for_each_entry(name_loop, &udev.symlink_list, node)
+				list_for_each_entry(name_loop, &udev->symlink_list, node)
 					printf("%s ", name_loop->name);
 			printf("\n");
+			break;
+		case QUERY_PATH:
+			printf("%s\n", udev->dev->devpath);
 			goto exit;
-		case PATH:
-			printf("%s\n", udev.devpath);
-			goto exit;
-		case ALL:
-			print_record(&udev);
-			goto exit;
+		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);
+			break;
 		default:
-			goto help;
+			print_help();
+			break;
 		}
-	}
-
-	if (attributes) {
+		break;
+	case ACTION_ATTRIBUTE_WALK:
 		if (path[0] == '\0') {
 			fprintf(stderr, "attribute walk on device chain needs path(-p) specified\n");
-			retval = 4;
+			rc = 4;
 			goto exit;
-		} else {
-			if (strncmp(path, sysfs_path, strlen(sysfs_path)) != 0) {
-				/* prepend sysfs mountpoint if not given */
-				snprintf(temp, sizeof(temp), "%s%s", sysfs_path, path);
-				temp[sizeof(temp)-1] = '\0';
-				strlcpy(path, temp, sizeof(temp));
-			}
+		} else
 			print_device_chain(path);
-			goto exit;
-		}
-	}
-
-	if (root) {
+		break;
+	case ACTION_ROOT:
 		printf("%s\n", udev_root);
-		goto exit;
+		break;
+	default:
+		print_help();
+		rc = 1;
+		break;
 	}
 
-help:
-	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"
-	       "             '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);
+	udev_device_cleanup(udev);
+	sysfs_cleanup();
 	logging_close();
-	return retval;
+	return rc;
 }