X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=d0b1c447f4d65f2692b026996333dbf58f8f0328;hp=d2c3e1ab7f334498f759a23f2244fab46f816a7a;hb=14e1e49484401d573eac1a99002242dbf7c072f0;hpb=e8d569b4145a358775e87058829133fa725b32fd

diff --git a/udevinfo.c b/udevinfo.c
index d2c3e1ab7..d0b1c447f 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -1,7 +1,5 @@
 /*
- * udevinfo.c - fetches attributes for a device
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2006 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
@@ -14,25 +12,24 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
 #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 <getopt.h>
+#include <sys/stat.h>
+#include <sys/types.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,134 +46,201 @@ 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, const char *key)
 {
-	struct sysfs_attribute *attr;
-	char value[VALUE_SIZE];
-	size_t len;
-
-	dlist_for_each_data(attr_list, attr, struct sysfs_attribute) {
-		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;
-		}
+	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)) {
+			struct stat statbuf;
+			char filename[PATH_SIZE];
+			char *attr_value;
+			char value[NAME_SIZE];
+			size_t len;
+
+			if (dent->d_name[0] == '.')
+				continue;
+
+			strlcpy(filename, path, sizeof(filename));
+			strlcat(filename, "/", sizeof(filename));
+			strlcat(filename, dent->d_name, sizeof(filename));
+			if (lstat(filename, &statbuf) != 0)
+				continue;
+			if (S_ISLNK(statbuf.st_mode))
+				continue;
+
+			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 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", dent->d_name);
+				continue;
+			}
 
-		/* 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_chars(value, ALLOWED_CHARS_INPUT);
+			printf("    %s{%s}==\"%s\"\n", key, dent->d_name, value);
 		}
-		replace_untrusted_chars(value);
-		printf("    SYSFS{%s}==\"%s\"\n", attr->name, value);
 	}
 	printf("\n");
 }
 
-static int print_record(struct udevice *udev)
+static int print_device_chain(const char *devpath)
+{
+	struct sysfs_device *dev;
+
+	dev = sysfs_device_get(devpath);
+	if (dev == NULL)
+		return -1;
+
+	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("  looking at device '%s':\n", dev->devpath);
+	printf("    KERNEL==\"%s\"\n", dev->kernel);
+	printf("    SUBSYSTEM==\"%s\"\n", dev->subsystem);
+	printf("    DRIVER==\"%s\"\n", dev->driver);
+	print_all_attributes(dev->devpath, "ATTR");
+
+	/* 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("    KERNELS==\"%s\"\n", dev->kernel);
+		printf("    SUBSYSTEMS==\"%s\"\n", dev->subsystem);
+		printf("    DRIVERS==\"%s\"\n", dev->driver);
+
+		print_all_attributes(dev->devpath, "ATTRS");
+	}
+
+	return 0;
+}
+
+static void print_record(struct udevice *udev)
 {
 	struct name_entry *name_loop;
 
-	printf("P: %s\n", udev->devpath);
+	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);
+	if (udev->link_priority != 0)
+		printf("L: %i\n", udev->link_priority);
+	if (udev->partitions != 0)
+		printf("A:%u\n", udev->partitions);
+	if (udev->ignore_remove)
+		printf("R:%u\n", udev->ignore_remove);
+	list_for_each_entry(name_loop, &udev->env_list, node)
+		printf("E: %s\n", name_loop->name);
+}
 
-	return 0;
+static void export_db(void) {
+	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_db = udev_device_init(NULL);
+		if (udev_db == NULL)
+			continue;
+		if (udev_db_get_device(udev_db, name_loop->name) == 0)
+			print_record(udev_db);
+			printf("\n");
+		udev_device_cleanup(udev_db);
+	}
+	name_list_cleanup(&name_list);
 }
 
-static int print_device_chain(const char *path)
+static int lookup_device_by_name(struct udevice *udev, const char *name)
 {
-	struct sysfs_class_device *class_dev;
-	struct sysfs_class_device *class_dev_parent;
-	struct sysfs_attribute *attr;
-	struct sysfs_device *sysfs_dev;
-	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;
-	}
+	LIST_HEAD(name_list);
+	int count;
+	struct name_entry *device;
+	int rc  = -1;
 
-	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");
+	count = udev_db_get_devices_by_name(name, &name_list);
+	if (count <= 0)
+		goto out;
 
-	/* 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);
+	info("found %i devices for '%s'", count, name);
 
-	/* 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);
+	/* select the device that seems to match */
+	list_for_each_entry(device, &name_list, node) {
+		char filename[PATH_SIZE];
+		struct stat statbuf;
 
-	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 \"device\"-link to the physical device:\n");
-
-	/* look the device chain upwards */
-	while (sysfs_dev != NULL) {
-		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);
-
-		attr_list = sysfs_get_device_attributes(sysfs_dev);
-		if (attr_list != NULL)
-			print_all_attributes(attr_list);
-		else
-			printf("\n");
+		udev_device_init(udev);
+		if (udev_db_get_device(udev, device->name) != 0)
+			continue;
+		info("found db entry '%s'", device->name);
 
-		sysfs_dev = sysfs_get_device_parent(sysfs_dev);
-		if (sysfs_dev == NULL)
-			break;
+		/* make sure, we don't get a link of a differnt device */
+		strlcpy(filename, udev_root, sizeof(filename));
+		strlcat(filename, "/", sizeof(filename));
+		strlcat(filename, name, sizeof(filename));
+		if (stat(filename, &statbuf) != 0)
+			continue;
+		if (major(udev->devt) > 0 && udev->devt != statbuf.st_rdev) {
+			info("skip '%s', dev_t doesn't match", udev->name);
+			continue;
+		}
+		rc = 0;
+		break;
 	}
-
-exit:
-	sysfs_close_class_device(class_dev);
-	return retval;
-}
-
-static int print_dump(const char *devpath, const char *name) {
-	printf("%s=%s/%s\n", devpath, udev_root, name);
-	return 0;
+out:
+	name_list_cleanup(&name_list);
+	return rc;
 }
 
 int main(int argc, char *argv[], char *envp[])
 {
-	static const char short_options[] = "adn:p:q:rVh";
 	int option;
-	struct udevice udev;
+	struct udevice *udev;
 	int root = 0;
-	int attributes = 0;
+
+	static const struct option options[] = {
+		{ "name", 1, NULL, 'n' },
+		{ "path", 1, NULL, 'p' },
+		{ "query", 1, NULL, 'q' },
+		{ "attribute-walk", 0, NULL, 'a' },
+		{ "export-db", 0, NULL, 'e' },
+		{ "root", 0, NULL, 'r' },
+		{ "version", 0, NULL, 1 }, /* -V outputs braindead format */
+		{ "help", 0, NULL, 'h' },
+		{}
+	};
+
+	enum action_type {
+		ACTION_NONE,
+		ACTION_QUERY,
+		ACTION_ATTRIBUTE_WALK,
+		ACTION_ROOT,
+	} action = ACTION_NONE;
+
 	enum query_type {
 		QUERY_NONE,
 		QUERY_NAME,
@@ -185,218 +249,201 @@ int main(int argc, char *argv[], char *envp[])
 		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_config_init();
+	sysfs_init();
 
-	udev_init_config();
-	udev_init_device(&udev, NULL, NULL, NULL);
+	udev = udev_device_init(NULL);
+	if (udev == NULL) {
+		rc = 1;
+		goto exit;
+	}
 
-	/* get command line options */
 	while (1) {
-		option = getopt(argc, argv, short_options);
+		option = getopt_long(argc, argv, "aen:p:q:rVh", options, NULL);
 		if (option == -1)
 			break;
 
 		dbg("option '%c'", option);
 		switch (option) {
 		case 'n':
-			dbg("udev name: %s\n", optarg);
-			strlcpy(name, optarg, sizeof(name));
+			/* remove /dev if given */
+			if (strncmp(optarg, udev_root, strlen(udev_root)) == 0)
+				strlcpy(name, &optarg[strlen(udev_root)+1], sizeof(name));
+			else
+				strlcpy(name, optarg, sizeof(name));
+			dbg("name: %s", name);
 			break;
-
 		case 'p':
-			dbg("udev path: %s\n", optarg);
-			strlcpy(path, optarg, sizeof(path));
+			/* remove /sys if given */
+			if (strncmp(optarg, sysfs_path, strlen(sysfs_path)) == 0)
+				strlcpy(path, &optarg[strlen(sysfs_path)], sizeof(path));
+			else
+				strlcpy(path, optarg, sizeof(path));
+			dbg("path: %s", path);
 			break;
-
 		case 'q':
-			dbg("udev query: %s\n", optarg);
-
+			action = ACTION_QUERY;
 			if (strcmp(optarg, "name") == 0) {
 				query = QUERY_NAME;
 				break;
 			}
-
 			if (strcmp(optarg, "symlink") == 0) {
 				query = QUERY_SYMLINK;
 				break;
 			}
-
 			if (strcmp(optarg, "path") == 0) {
 				query = QUERY_PATH;
 				break;
 			}
-
 			if (strcmp(optarg, "env") == 0) {
 				query = QUERY_ENV;
 				break;
 			}
-
 			if (strcmp(optarg, "all") == 0) {
 				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);
+		case 'e':
+			export_db();
+			goto exit;
+		case 1:
+			printf("%s\n", UDEV_VERSION);
 			goto exit;
-
 		case 'V':
 			printf("udevinfo, version %s\n", UDEV_VERSION);
 			goto exit;
-
 		case 'h':
-			retval = 2;
-		case '?':
+			printf("Usage: udevinfo OPTIONS\n"
+			       "  --query=<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"
+			       "  --path=<devpath>  sysfs device path used for query or chain\n"
+			       "  --name=<name>     node or symlink name used for query\n"
+			       "\n"
+			       "  --root            prepend to query result or print udev_root\n"
+			       "  --attribute-walk  print all SYSFS_attributes along the device chain\n"
+			       "  --export-db       export the content of the udev database\n"
+			       "  --help            print this text\n"
+			       "\n");
+			goto exit;
 		default:
-			goto help;
+			goto exit;
 		}
 	}
 
-	/* process options */
-	if (query != QUERY_NONE) {
+	/* run action */
+	switch (action) {
+	case ACTION_QUERY:
+		/* needs 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) {
-				pos = path + strlen(sysfs_path);
-			} else {
-				if (path[0] != '/') {
-					/* prepend '/' if missing */
-					strcpy(temp, "/");
-					strlcpy(temp, path, sizeof(temp));
-					pos = temp;
-				} else {
-					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, path) != 0) {
+				fprintf(stderr, "no record for '%s' in database\n", path);
+				rc = 3;
 				goto exit;
 			}
-			goto print;
-		}
-
-		if (name[0] != '\0') {
-			char devpath[PATH_SIZE];
-			int len;
-
-			/* remove udev_root if given */
-			len = strlen(udev_root);
-			if (strncmp(name, udev_root, len) == 0) {
-				pos = &name[len+1];
-			} else
-				pos = name;
-
-			retval = udev_db_search_name(devpath, sizeof(devpath), pos);
-			if (retval != 0) {
-				fprintf(stderr, "device not found in database\n");
+		} else if (name[0] != '\0') {
+			if (lookup_device_by_name(udev, name) != 0) {
+				fprintf(stderr, "node name not found\n");
+				rc = 4;
 				goto exit;
 			}
-			udev_db_get_device(&udev, devpath);
-			goto print;
+		} else {
+			fprintf(stderr, "query needs --path or node --name 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 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;
+				printf("%s\n", udev->name);
+			break;
 		case QUERY_SYMLINK:
-			if (list_empty(&udev.symlink_list))
-				break;
+			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");
-			goto exit;
+			break;
 		case QUERY_PATH:
-			printf("%s\n", udev.devpath);
+			printf("%s\n", udev->dev->devpath);
 			goto exit;
 		case QUERY_ENV:
-			list_for_each_entry(name_loop, &udev.env_list, node)
+			list_for_each_entry(name_loop, &udev->env_list, node)
 				printf("%s\n", name_loop->name);
-			goto exit;
+			break;
 		case QUERY_ALL:
-			print_record(&udev);
-			goto exit;
+			print_record(udev);
+			break;
 		default:
-			goto help;
+			fprintf(stderr, "unknown query type\n");
+			break;
 		}
-	}
-
-	if (attributes) {
-		if (path[0] == '\0') {
-			fprintf(stderr, "attribute walk on device chain needs path(-p) specified\n");
-			retval = 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));
+		break;
+	case ACTION_ATTRIBUTE_WALK:
+		if (path[0] != '\0') {
+			if (print_device_chain(path) != 0) {
+				fprintf(stderr, "no valid sysfs device found\n");
+				rc = 4;
+				goto exit;
+			}
+		} else if (name[0] != '\0') {
+			if (lookup_device_by_name(udev, name) != 0) {
+				fprintf(stderr, "node name not found\n");
+				rc = 4;
+				goto exit;
+			}
+			if (print_device_chain(udev->dev->devpath) != 0) {
+				fprintf(stderr, "no valid sysfs device found\n");
+				rc = 4;
+				goto exit;
 			}
-			print_device_chain(path);
+		} else {
+			fprintf(stderr, "attribute walk needs --path or node --name specified\n");
+			rc = 5;
 			goto exit;
 		}
-	}
-
-	if (root) {
+		break;
+	case ACTION_ROOT:
 		printf("%s\n", udev_root);
-		goto exit;
+		break;
+	default:
+		fprintf(stderr, "missing option\n");
+		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"
-	       "             '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       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;
 }