X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=abc1e5ad5a98b80948cbdb7cd3c95b2ac37d1108;hp=40082abf03461a00580783c0055f7acf0f73df92;hb=d727cb90753179dd0a26911f679c668216a026ed;hpb=6eee03ef45fa3b04cf7ac94fd5bc5f982a33bfb7

diff --git a/udev_db.c b/udev_db.c
index 40082abf0..abc1e5ad5 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -77,6 +77,46 @@ static int name_index(const char *devpath, const char *name, int add)
 	return 0;
 }
 
+int udev_db_get_devices_by_name(const char *name, struct list_head *name_list)
+{
+	char dirname[PATH_MAX];
+	size_t start;
+	DIR *dir;
+	int rc = 0;
+
+	strlcpy(dirname, udev_root, sizeof(dirname));
+	start = strlcat(dirname, "/"DB_NAME_INDEX_DIR"/", sizeof(dirname));
+	strlcat(dirname, name, sizeof(dirname));
+	path_encode(&dirname[start], sizeof(dirname) - start);
+
+	dir = opendir(dirname);
+	if (dir == NULL) {
+		info("no index directory '%s': %s", dirname, strerror(errno));
+		rc = -1;
+		goto out;
+	}
+
+	info("found index directory '%s'", dirname);
+	while (1) {
+		struct dirent *ent;
+		char device[PATH_SIZE];
+
+		ent = readdir(dir);
+		if (ent == NULL || ent->d_name[0] == '\0')
+			break;
+		if (ent->d_name[0] == '.')
+			continue;
+
+		strlcpy(device, ent->d_name, sizeof(device));
+		path_decode(device);
+		name_list_add(name_list, device, 0);
+		rc++;
+	}
+	closedir(dir);
+out:
+	return rc;
+}
+
 int udev_db_add_device(struct udevice *udev)
 {
 	char filename[PATH_SIZE];
@@ -117,9 +157,9 @@ int udev_db_add_device(struct udevice *udev)
 			name_index(udev->dev->devpath, name_loop->name, 1);
 		}
 		fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
-		if (udev->link_priority)
+		if (udev->link_priority != 0)
 			fprintf(f, "L:%u\n", udev->link_priority);
-		if (udev->partitions)
+		if (udev->partitions != 0)
 			fprintf(f, "A:%u\n", udev->partitions);
 		if (udev->ignore_remove)
 			fprintf(f, "R:%u\n", udev->ignore_remove);
@@ -146,7 +186,7 @@ int udev_db_get_device(struct udevice *udev, const char *devpath)
 	size_t cur;
 	size_t count;
 
-	strlcpy(udev->dev->devpath, devpath, sizeof(udev->dev->devpath));
+	sysfs_device_set_values(udev->dev, devpath, NULL, NULL);
 	devpath_to_db_path(devpath, filename, sizeof(filename));
 
 	if (lstat(filename, &stats) != 0) {
@@ -246,6 +286,9 @@ int udev_db_delete_device(struct udevice *udev)
 	char filename[PATH_SIZE];
 	struct name_entry *name_loop;
 
+	if (udev->test_run)
+		return 0;
+
 	devpath_to_db_path(udev->dev->devpath, filename, sizeof(filename));
 	unlink(filename);
 
@@ -256,68 +299,6 @@ int udev_db_delete_device(struct udevice *udev)
 	return 0;
 }
 
-int udev_db_lookup_name(const char *name, char *devpath, size_t len)
-{
-	char dirname[PATH_MAX];
-	size_t start;
-	DIR *dir;
-	int found = 0;
-
-	strlcpy(dirname, udev_root, sizeof(dirname));
-	start = strlcat(dirname, "/"DB_NAME_INDEX_DIR"/", sizeof(dirname));
-	strlcat(dirname, name, sizeof(dirname));
-	path_encode(&dirname[start], sizeof(dirname) - start);
-
-	dir = opendir(dirname);
-	if (dir == NULL) {
-		info("no index directory '%s': %s", dirname, strerror(errno));
-		return -1;
-	}
-
-	info("found index directory '%s'", dirname);
-	while (!found) {
-		struct dirent *ent;
-		char device[PATH_SIZE];
-		struct udevice *udev;
-
-		ent = readdir(dir);
-		if (ent == NULL || ent->d_name[0] == '\0')
-			break;
-		if (ent->d_name[0] == '.')
-			continue;
-
-		strlcpy(device, ent->d_name, sizeof(device));
-		path_decode(device);
-		udev = udev_device_init();
-		if (udev == NULL)
-			break;
-		if (udev_db_get_device(udev, device) == 0) {
-			char filename[PATH_SIZE];
-			struct stat statbuf;
-
-			info("found db entry '%s'", device);
-			strlcpy(filename, udev_root, sizeof(filename));
-			strlcat(filename, "/", sizeof(filename));
-			strlcat(filename, name, sizeof(filename));
-			/* make sure device entry matches dev_t */
-			if (stat(filename, &statbuf) == 0) {
-				if (statbuf.st_rdev == udev->devt) {
-					info("node '%s' matches dev_t", udev->name);
-					strlcpy(devpath, device, len);
-					found = 1;
-				}
-			}
-		}
-		udev_device_cleanup(udev);
-	}
-
-	closedir(dir);
-	if (found)
-		return 0;
-	else
-		return -1;
-}
-
 int udev_db_get_all_entries(struct list_head *name_list)
 {
 	char dbpath[PATH_MAX];