X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-info.c;h=7206f4fcf621ed8f3c32cf35ed78d221b3b44a2e;hp=5f6209af2a772666082f7b12e6964666dab173c8;hb=4281da1fa6fda10c15bee984825fc607a8385004;hpb=a89d342dfb45b54e29381af9dbc495bbb2b057af

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index 5f6209af2..7206f4fcf 100644
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -142,10 +142,6 @@ static void print_record(struct udev_device *device)
 	if (i != 0)
 		printf("L: %i\n", i);
 
-	i = udev_device_get_watch_handle(device);
-	if (i >= 0)
-		printf("W: %u\n", i);
-
 	udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device)) {
 		len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
 		printf("S: %s\n", &udev_list_entry_get_name(list_entry)[len+1]);
@@ -158,7 +154,7 @@ static void print_record(struct udev_device *device)
 	printf("\n");
 }
 
-static int stat_device(const char *name, int export, const char *prefix)
+static int stat_device(const char *name, bool export, const char *prefix)
 {
 	struct stat statbuf;
 
@@ -199,11 +195,65 @@ 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 statbuf;
+			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)
+				goto next;
+			util_strscpyl(to, sizeof(to), udev_get_dev_path(udev), "/.udev/db/", id, NULL);
+
+			/* do not overwrite a new database file */
+			if (lstat(to, &statbuf) == 0)
+				goto next;
+
+			/* 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, &statbuf) == 0) {
+				rename(from, to);
+				goto next;
+			}
+
+			/* 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, &statbuf) == 0) {
+				rename(from, to);
+				goto next;
+			}
+next:
+			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;
-	int root = 0;
-	int export = 0;
+	bool root = 0;
+	bool export = 0;
 	const char *export_prefix = NULL;
 	char path[UTIL_PATH_SIZE];
 	char name[UTIL_PATH_SIZE];
@@ -216,6 +266,7 @@ 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' },
@@ -242,11 +293,11 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		QUERY_ALL,
 	} query = QUERY_NONE;
 
-	while (1) {
+	for (;;) {
 		int option;
 		struct stat statbuf;
 
-		option = getopt_long(argc, argv, "aed:n:p:q:rxPVh", options, NULL);
+		option = getopt_long(argc, argv, "aed:n:p:q:rxP:Vh", options, NULL);
 		if (option == -1)
 			break;
 
@@ -328,7 +379,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		case 'r':
 			if (action == ACTION_NONE)
 				action = ACTION_ROOT;
-			root = 1;
+			root = true;
 			break;
 		case 'd':
 			action = ACTION_DEVICE_ID_FILE;
@@ -340,8 +391,11 @@ 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 = 1;
+			export = true;
 			break;
 		case 'P':
 			export_prefix = optarg;
@@ -363,7 +417,10 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 			       "  --attribute-walk           print all key matches while walking along the chain\n"
 			       "                             of parent devices\n"
 			       "  --device-id-of-file=<file> print major:minor of device containing this file\n"
+			       "  --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:
@@ -421,7 +478,17 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		case QUERY_PROPERTY:
 			list_entry = udev_device_get_properties_list_entry(device);
 			while (list_entry != NULL) {
-				printf("%s=%s\n", udev_list_entry_get_name(list_entry), udev_list_entry_get_value(list_entry));
+				if (export) {
+					const char *prefix = export_prefix;
+
+					if (prefix == NULL)
+						prefix = "";
+					printf("%s%s='%s'\n", prefix,
+					       udev_list_entry_get_name(list_entry),
+					       udev_list_entry_get_value(list_entry));
+				} else {
+					printf("%s=%s\n", udev_list_entry_get_name(list_entry), udev_list_entry_get_value(list_entry));
+				}
 				list_entry = udev_list_entry_get_next(list_entry);
 			}
 			break;