X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-info.c;h=b3b31ebafe459abc971527b05a2f82c51448989a;hp=14baa6accb79c979e984f267623d649a6bec6806;hb=88163971b93260474bf2dd3195dc4e72098584ba;hpb=88cbfb09ee5510277503ff1830ecc3aa6c380b00

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index 14baa6acc..b3b31ebaf 100644
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -154,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;
 
@@ -198,8 +198,8 @@ static int export_devices(struct udev *udev)
 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];
@@ -242,7 +242,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:rxPVh", options, NULL);
+		option = getopt_long(argc, argv, "aed:n:p:q:rxP:Vh", options, NULL);
 		if (option == -1)
 			break;
 
@@ -324,7 +324,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;
@@ -337,7 +337,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 			export_devices(udev);
 			goto exit;
 		case 'x':
-			export = 1;
+			export = true;
 			break;
 		case 'P':
 			export_prefix = optarg;
@@ -417,7 +417,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;