X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=eb9b3534046ea6de2c2014219945d1ab31b83eff;hp=3f25be03f84b26bac274ec26b111971ca59418c5;hb=6e9edde6c962ab183e8d86086bddda7aa6e3cb9b;hpb=3d0bb292b5738dc173285a0a3cf2703fd15ca9be

diff --git a/udevinfo.c b/udevinfo.c
index 3f25be03f..eb9b35340 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -79,6 +79,8 @@ static void print_all_attributes(const char *devpath, const char *key)
 			if (attr_value == NULL)
 				continue;
 			len = strlcpy(value, attr_value, sizeof(value));
+			if(len >= sizeof(value))
+				len = sizeof(value) - 1;
 			dbg("attr '%s'='%s'(%zi)", dent->d_name, value, len);
 
 			/* remove trailing newlines */
@@ -93,7 +95,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 +146,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);
 }
@@ -173,13 +180,17 @@ static void export_db(void) {
 static int lookup_device_by_name(struct udevice *udev, const char *name)
 {
 	LIST_HEAD(name_list);
+	int count;
 	struct name_entry *device;
 	int rc  = -1;
 
-	if (udev_db_get_devices_by_name(name, &name_list) <= 0)
+	count = udev_db_get_devices_by_name(name, &name_list);
+	if (count <= 0)
 		goto out;
 
-	/* select the device that matches the dev_t of name */
+	info("found %i devices for '%s'", count, name);
+
+	/* select the device that seems to match */
 	list_for_each_entry(device, &name_list, node) {
 		char filename[PATH_SIZE];
 		struct stat statbuf;
@@ -189,16 +200,18 @@ static int lookup_device_by_name(struct udevice *udev, const char *name)
 			continue;
 		info("found db entry '%s'", device->name);
 
+		/* make sure, we don't get a link of a differnt device */
 		strlcpy(filename, udev_root, sizeof(filename));
 		strlcat(filename, "/", sizeof(filename));
 		strlcat(filename, name, sizeof(filename));
 		if (stat(filename, &statbuf) != 0)
 			continue;
-		if (statbuf.st_rdev == udev->devt) {
-			info("found '%s', dev_t matches", udev->name);
-			rc = 0;
-			break;
+		if (major(udev->devt) > 0 && udev->devt != statbuf.st_rdev) {
+			info("skip '%s', dev_t doesn't match", udev->name);
+			continue;
 		}
+		rc = 0;
+		break;
 	}
 out:
 	name_list_cleanup(&name_list);
@@ -254,7 +267,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)
@@ -268,7 +280,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 */
@@ -276,10 +288,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;
@@ -374,15 +385,14 @@ int main(int argc, char *argv[], char *envp[])
 				printf("%s\n", udev->name);
 			break;
 		case QUERY_SYMLINK:
-			if (list_empty(&udev->symlink_list))
-				goto exit;
-			if (root)
-				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					printf("%s/%s ", udev_root, name_loop->name);
-			else
-				list_for_each_entry(name_loop, &udev->symlink_list, node)
-					printf("%s ", name_loop->name);
-			printf("\n");
+			list_for_each_entry(name_loop, &udev->symlink_list, node) {
+				char c = name_loop->node.next != &udev->symlink_list ? ' ' : '\n';
+
+				if (root)
+					printf("%s/%s%c", udev_root, name_loop->name, c);
+				else
+					printf("%s%c", name_loop->name, c);
+			}
 			break;
 		case QUERY_PATH:
 			printf("%s\n", udev->dev->devpath);
@@ -402,7 +412,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;
 			}
@@ -413,7 +423,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;
 			}