X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=udev%2Fudevadm-info.c;h=33d113c5b1cb9b7271634d3b0e918de8a3ef99e5;hb=5f59fa0900a5c127ce1a25d8ba3176f166662f96;hp=f60ad2c4506b727a3b4ee474fb91827c674c679c;hpb=95ce1875d79162324a5eb67f6a0ffbbdd5d29921;p=elogind.git

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index f60ad2c45..33d113c5b 100644
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -31,37 +31,50 @@
 
 #include "udev.h"
 
+static bool skip_attribute(const char *name)
+{
+	static const char const *skip[] = {
+		"uevent",
+		"dev",
+		"modalias",
+		"resource",
+		"driver",
+		"subsystem",
+		"module",
+	};
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(skip); i++)
+		if (strcmp(name, skip[i]) == 0)
+			return true;
+	return false;
+}
+
 static void print_all_attributes(struct udev_device *device, const char *key)
 {
 	struct udev_list_entry *sysattr;
 
 	udev_list_entry_foreach(sysattr, udev_device_get_sysattr_list_entry(device)) {
+		struct udev *udev = udev_device_get_udev(device);
 		const char *name;
 		const char *value;
 		size_t len;
 
-		/* skip symlinks */
-		if (0 == strcmp("s", udev_list_entry_get_value(sysattr)))
-			continue;
-
 		name = udev_list_entry_get_name(sysattr);
-		if (strcmp(name, "uevent") == 0)
-			continue;
-		if (strcmp(name, "dev") == 0)
+		if (skip_attribute(name))
 			continue;
 
 		value = udev_device_get_sysattr_value(device, name);
 		if (value == NULL)
 			continue;
-		dbg(udev_device_get_udev(device), "attr '%s'='%s'\n", name, value);
+		dbg(udev, "attr '%s'='%s'\n", name, value);
 
 		/* skip nonprintable attributes */
 		len = strlen(value);
 		while (len > 0 && isprint(value[len-1]))
 			len--;
 		if (len > 0) {
-			dbg(udev_device_get_udev(device),
-					"attribute value of '%s' non-printable, skip\n", name);
+			dbg(udev, "attribute value of '%s' non-printable, skip\n", name);
 			continue;
 		}
 
@@ -187,66 +200,6 @@ static int export_devices(struct udev *udev)
 	return 0;
 }
 
-static int convert_db(struct udev *udev)
-{
-	struct udev_enumerate *udev_enumerate;
-	struct udev_list_entry *list_entry;
-
-	udev_enumerate = udev_enumerate_new(udev);
-	if (udev_enumerate == NULL)
-		return -1;
-	udev_enumerate_scan_devices(udev_enumerate);
-	udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(udev_enumerate)) {
-		struct udev_device *device;
-
-		device = udev_device_new_from_syspath(udev, udev_list_entry_get_name(list_entry));
-		if (device != NULL) {
-			const char *id;
-			struct stat stats;
-			char to[UTIL_PATH_SIZE];
-			char devpath[UTIL_PATH_SIZE];
-			char from[UTIL_PATH_SIZE];
-
-			id = udev_device_get_id_filename(device);
-			if (id == NULL) {
-				udev_device_unref(device);
-				continue;
-			}
-			util_strscpyl(to, sizeof(to), udev_get_dev_path(udev), "/.udev/db/", id, NULL);
-
-			/* find old database with $subsys:$sysname */
-			util_strscpyl(from, sizeof(from), udev_get_dev_path(udev),
-				     "/.udev/db/", udev_device_get_subsystem(device), ":",
-				     udev_device_get_sysname(device), NULL);
-			if (lstat(from, &stats) == 0) {
-				if (lstat(to, &stats) == 0)
-					unlink(from);
-				else
-					rename(from, to);
-			}
-
-			/* find old database with the encoded devpath */
-			util_path_encode(udev_device_get_devpath(device), devpath, sizeof(devpath));
-			util_strscpyl(from, sizeof(from), udev_get_dev_path(udev),
-				      "/.udev/db/", devpath, NULL);
-			if (lstat(from, &stats) == 0) {
-				if (lstat(to, &stats) == 0)
-					unlink(from);
-				else
-					rename(from, to);
-			}
-
-			/* read the old database, and write out a new one */
-			udev_device_read_db(device);
-			udev_device_update_db(device);
-
-			udev_device_unref(device);
-		}
-	}
-	udev_enumerate_unref(udev_enumerate);
-	return 0;
-}
-
 int udevadm_info(struct udev *udev, int argc, char *argv[])
 {
 	struct udev_device *device = NULL;
@@ -264,7 +217,6 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		{ "query", required_argument, NULL, 'q' },
 		{ "attribute-walk", no_argument, NULL, 'a' },
 		{ "export-db", no_argument, NULL, 'e' },
-		{ "convert-db", no_argument, NULL, 'C' },
 		{ "root", no_argument, NULL, 'r' },
 		{ "device-id-of-file", required_argument, NULL, 'd' },
 		{ "export", no_argument, NULL, 'x' },
@@ -389,9 +341,6 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		case 'e':
 			export_devices(udev);
 			goto exit;
-		case 'C':
-			convert_db(udev);
-			goto exit;
 		case 'x':
 			export = true;
 			break;
@@ -418,7 +367,6 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 			       "  --export                   export key/value pairs\n"
 			       "  --export-prefix            export the key name with a prefix\n"
 			       "  --export-db                export the content of the udev database\n"
-			       "  --convert-db               convert older version of database without a reboot\n"
 			       "  --help\n\n");
 			goto exit;
 		default: