X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-info.c;h=9357f672083e86a36fc22b160d487c3b72a9f706;hp=a231fd8d0b37d0a32a3b309cab816c5b60b53da0;hb=2d74bc75792bdd993e6298cf253541624001517c;hpb=20bee04c19e49a0cef3bd7dfec9028270c46172b

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index a231fd8d0..9357f6720 100644
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -33,7 +33,7 @@
 
 static bool skip_attribute(const char *name)
 {
-	char *skip[] = {
+	static const char const *skip[] = {
 		"uevent",
 		"dev",
 		"modalias",
@@ -200,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;
@@ -277,8 +217,8 @@ 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' },
+		{ "run", no_argument, NULL, 'R' },
 		{ "device-id-of-file", required_argument, NULL, 'd' },
 		{ "export", no_argument, NULL, 'x' },
 		{ "export-prefix", required_argument, NULL, 'P' },
@@ -308,7 +248,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		int option;
 		struct stat statbuf;
 
-		option = getopt_long(argc, argv, "aed:n:p:q:rxP:Vh", options, NULL);
+		option = getopt_long(argc, argv, "aed:n:p:q:rxP:RVh", options, NULL);
 		if (option == -1)
 			break;
 
@@ -392,6 +332,9 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 				action = ACTION_ROOT;
 			root = true;
 			break;
+		case 'R':
+			printf("%s\n", udev_get_run_path(udev));
+			goto exit;
 		case 'd':
 			action = ACTION_DEVICE_ID_FILE;
 			util_strscpy(name, sizeof(name), optarg);
@@ -402,9 +345,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;
@@ -431,7 +371,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: