X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-info.c;h=f20eb07e046bd462f576c45967746e21f368428c;hb=b44b7f884136e1ef4452818ed514a5d7e51567f1;hp=ec098abd187a102d3f0874dd23e96484b2fb9fb4;hpb=033e9f8cde5a7feec1334888aec69def99c945b5;p=elogind.git

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index ec098abd1..f20eb07e0 100644
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -60,7 +60,7 @@ static void print_all_attributes(struct udev_device *device, const char *key)
 			if (S_ISLNK(statbuf.st_mode))
 				continue;
 
-			value = udev_device_get_attr_value(device, dent->d_name);
+			value = udev_device_get_sysattr_value(device, dent->d_name);
 			if (value == NULL)
 				continue;
 			dbg(udev, "attr '%s'='%s'(%zi)\n", dent->d_name, value, len);
@@ -87,7 +87,7 @@ static int print_device_chain(struct udev_device *device)
 	const char *str;
 
 	printf("\n"
-	       "Udevinfo starts with the device specified by the devpath and then\n"
+	       "Udevadm info 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"
@@ -130,26 +130,33 @@ static int print_device_chain(struct udev_device *device)
 static void print_record(struct udev_device *device)
 {
 	size_t len;
+	const char *str;
 	int i;
 	struct udev_list_entry *list_entry;
 
 	printf("P: %s\n", udev_device_get_devpath(device));
 
 	len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
-	printf("N: %s\n", &udev_device_get_devnode(device)[len+1]);
+	str = udev_device_get_devnode(device);
+	if (str != NULL)
+		printf("N: %s\n", &str[len+1]);
 
-	i = device_get_devlink_priority(device);
+	i = udev_device_get_devlink_priority(device);
 	if (i != 0)
 		printf("L: %i\n", i);
 
-	i = device_get_num_fake_partitions(device);
+	i = udev_device_get_num_fake_partitions(device);
 	if (i != 0)
 		printf("A:%u\n", i);
 
-	i = device_get_ignore_remove(device);
+	i = udev_device_get_ignore_remove(device);
 	if (i != 0)
 		printf("R:%u\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]);
@@ -159,7 +166,6 @@ static void print_record(struct udev_device *device)
 		printf("E: %s=%s\n",
 		       udev_list_entry_get_name(list_entry),
 		       udev_list_entry_get_value(list_entry));
-
 	printf("\n");
 }
 
@@ -196,8 +202,7 @@ static int export_devices(struct udev *udev)
 
 		device = udev_device_new_from_syspath(udev, udev_list_entry_get_name(list_entry));
 		if (device != NULL) {
-			if (udev_device_get_devnode(device) != NULL)
-				print_record(device);
+			print_record(device);
 			udev_device_unref(device);
 		}
 	}
@@ -226,7 +231,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		{ "device-id-of-file", required_argument, NULL, 'd' },
 		{ "export", no_argument, NULL, 'x' },
 		{ "export-prefix", required_argument, NULL, 'P' },
-		{ "version", no_argument, NULL, 1 }, /* -V outputs braindead format */
+		{ "version", no_argument, NULL, 'V' },
 		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
@@ -364,11 +369,8 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		case 'P':
 			export_prefix = optarg;
 			break;
-		case 1:
-			printf("%s\n", VERSION);
-			goto exit;
 		case 'V':
-			printf("udevinfo, version %s\n", VERSION);
+			printf("%s\n", VERSION);
 			goto exit;
 		case 'h':
 			printf("Usage: udevadm info OPTIONS\n"
@@ -385,8 +387,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 			       "                             of parent devices\n"
 			       "  --device-id-of-file=<file> print major:minor of device containing this file\n"
 			       "  --export-db                export the content of the udev database\n"
-			       "  --help                     print this text\n"
-			       "\n");
+			       "  --help\n\n");
 			goto exit;
 		default:
 			goto exit;