X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev_db.c;h=4f3dc606e4d12da4336b9e138600720d6821f410;hb=9921484458e0233e1aae868bfa8cc1481aa460a8;hp=763178d50ccb8ab2ef2d794c50e893bce5eaeb8d;hpb=31c1f537450e96f8ddd6a0fad2adaefe57996f03;p=elogind.git

diff --git a/udev/udev_db.c b/udev/udev_db.c
index 763178d50..4f3dc606e 100644
--- a/udev/udev_db.c
+++ b/udev/udev_db.c
@@ -44,8 +44,8 @@ static size_t devpath_to_db_path(struct udev *udev, const char *devpath, char *f
 /* reverse mapping from the device file name to the devpath */
 static int name_index(struct udev *udev, const char *devpath, const char *name, int add)
 {
-	char device[PATH_SIZE];
-	char filename[PATH_SIZE * 2];
+	char device[UTIL_PATH_SIZE];
+	char filename[UTIL_PATH_SIZE * 2];
 	size_t start;
 	int fd;
 
@@ -96,7 +96,7 @@ int udev_db_get_devices_by_name(struct udev *udev, const char *name, struct list
 	info(udev, "found index directory '%s'\n", dirname);
 	while (1) {
 		struct dirent *ent;
-		char device[PATH_SIZE];
+		char device[UTIL_PATH_SIZE];
 
 		ent = readdir(dir);
 		if (ent == NULL || ent->d_name[0] == '\0')
@@ -116,8 +116,8 @@ out:
 
 int udev_db_rename(struct udev *udev, const char *devpath_old, const char *devpath)
 {
-	char filename[PATH_SIZE];
-	char filename_old[PATH_SIZE];
+	char filename[UTIL_PATH_SIZE];
+	char filename_old[UTIL_PATH_SIZE];
 
 	devpath_to_db_path(udev, devpath_old, filename_old, sizeof(filename_old));
 	devpath_to_db_path(udev, devpath, filename, sizeof(filename));
@@ -126,7 +126,7 @@ int udev_db_rename(struct udev *udev, const char *devpath_old, const char *devpa
 
 int udev_db_add_device(struct udevice *udevice)
 {
-	char filename[PATH_SIZE];
+	char filename[UTIL_PATH_SIZE];
 
 	if (udevice->test_run)
 		return 0;
@@ -190,8 +190,8 @@ int udev_db_add_device(struct udevice *udevice)
 int udev_db_get_device(struct udevice *udevice, const char *devpath)
 {
 	struct stat stats;
-	char filename[PATH_SIZE];
-	char line[PATH_SIZE];
+	char filename[UTIL_PATH_SIZE];
+	char line[UTIL_PATH_SIZE];
 	unsigned int maj, min;
 	char *bufline;
 	char *buf;
@@ -207,7 +207,7 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath)
 		return -1;
 	}
 	if ((stats.st_mode & S_IFMT) == S_IFLNK) {
-		char target[NAME_SIZE];
+		char target[UTIL_NAME_SIZE];
 		int target_len;
 
 		info(udevice->udev, "found a symlink as db file\n");
@@ -277,7 +277,7 @@ int udev_db_get_device(struct udevice *udevice, const char *devpath)
 
 int udev_db_delete_device(struct udevice *udevice)
 {
-	char filename[PATH_SIZE];
+	char filename[UTIL_PATH_SIZE];
 	struct name_entry *name_loop;
 
 	if (udevice->test_run)
@@ -292,36 +292,3 @@ int udev_db_delete_device(struct udevice *udevice)
 
 	return 0;
 }
-
-int udev_db_get_all_entries(struct udev *udev, struct list_head *name_list)
-{
-	char dbpath[PATH_MAX];
-	DIR *dir;
-
-	util_strlcpy(dbpath, udev_get_dev_path(udev), sizeof(dbpath));
-	util_strlcat(dbpath, "/.udev/db", sizeof(dbpath));
-	dir = opendir(dbpath);
-	if (dir == NULL) {
-		info(udev, "no udev_db available '%s': %s\n", dbpath, strerror(errno));
-		return -1;
-	}
-
-	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;
-
-		util_strlcpy(device, ent->d_name, sizeof(device));
-		util_path_decode(device);
-		name_list_add(udev, name_list, device, 1);
-		dbg(udev, "added '%s'\n", device);
-	}
-
-	closedir(dir);
-	return 0;
-}