X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=d0b1c447f4d65f2692b026996333dbf58f8f0328;hp=4b4876cc11f10e03cad5efb5555da04dc382d116;hb=14e1e49484401d573eac1a99002242dbf7c072f0;hpb=be8594ab14f15203fcea4b2aa0115171472f3e43

diff --git a/udevinfo.c b/udevinfo.c
index 4b4876cc1..d0b1c447f 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -93,7 +93,7 @@ static void print_all_attributes(const char *devpath, const char *key)
 				continue;
 			}
 
-			replace_untrusted_chars(value);
+			replace_chars(value, ALLOWED_CHARS_INPUT);
 			printf("    %s{%s}==\"%s\"\n", key, dent->d_name, value);
 		}
 	}
@@ -144,9 +144,14 @@ static void print_record(struct udevice *udev)
 
 	printf("P: %s\n", udev->dev->devpath);
 	printf("N: %s\n", udev->name);
-	printf("L: %i\n", udev->link_priority);
 	list_for_each_entry(name_loop, &udev->symlink_list, node)
 		printf("S: %s\n", name_loop->name);
+	if (udev->link_priority != 0)
+		printf("L: %i\n", udev->link_priority);
+	if (udev->partitions != 0)
+		printf("A:%u\n", udev->partitions);
+	if (udev->ignore_remove)
+		printf("R:%u\n", udev->ignore_remove);
 	list_for_each_entry(name_loop, &udev->env_list, node)
 		printf("E: %s\n", name_loop->name);
 }
@@ -260,7 +265,6 @@ int main(int argc, char *argv[], char *envp[])
 		goto exit;
 	}
 
-	/* get command line options */
 	while (1) {
 		option = getopt_long(argc, argv, "aen:p:q:rVh", options, NULL);
 		if (option == -1)
@@ -274,7 +278,7 @@ int main(int argc, char *argv[], char *envp[])
 				strlcpy(name, &optarg[strlen(udev_root)+1], sizeof(name));
 			else
 				strlcpy(name, optarg, sizeof(name));
-			dbg("name: %s\n", name);
+			dbg("name: %s", name);
 			break;
 		case 'p':
 			/* remove /sys if given */
@@ -282,10 +286,9 @@ int main(int argc, char *argv[], char *envp[])
 				strlcpy(path, &optarg[strlen(sysfs_path)], sizeof(path));
 			else
 				strlcpy(path, optarg, sizeof(path));
-			dbg("path: %s\n", path);
+			dbg("path: %s", path);
 			break;
 		case 'q':
-			dbg("udev query: %s\n", optarg);
 			action = ACTION_QUERY;
 			if (strcmp(optarg, "name") == 0) {
 				query = QUERY_NAME;
@@ -408,7 +411,7 @@ int main(int argc, char *argv[], char *envp[])
 	case ACTION_ATTRIBUTE_WALK:
 		if (path[0] != '\0') {
 			if (print_device_chain(path) != 0) {
-				fprintf(stderr, "device not found\n");
+				fprintf(stderr, "no valid sysfs device found\n");
 				rc = 4;
 				goto exit;
 			}
@@ -419,7 +422,7 @@ int main(int argc, char *argv[], char *envp[])
 				goto exit;
 			}
 			if (print_device_chain(udev->dev->devpath) != 0) {
-				fprintf(stderr, "device not found\n");
+				fprintf(stderr, "no valid sysfs device found\n");
 				rc = 4;
 				goto exit;
 			}