X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_db.c;h=6e9a1187d03f4c94d0d19e1c609da5c6a65a97c1;hb=aab4c0eebef44c5b67d4c9537f1c5149de3ca9c2;hp=5caf3fda8049094aeefcbba3b8402baa4810fea9;hpb=df4e89bfa61b6aaea41619842aa9032dd1af072e;p=elogind.git

diff --git a/udev_db.c b/udev_db.c
index 5caf3fda8..6e9a1187d 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -35,16 +35,15 @@
 #include "udev.h"
 #include "udev_utils.h"
 #include "logging.h"
-#include "udev_db.h"
 
-#define PATH_TO_NAME_CHAR		'@'
 
 static int devpath_to_db_path(const char *devpath, char *filename, size_t len)
 {
 	size_t start, end, i;
 
 	/* add location of db files */
-	start = strlcpy(filename, udev_db_path, len);
+	strlcpy(filename, udev_root, len);
+	start = strlcat(filename, "/"DB_DIR, len);
 	end = strlcat(filename, devpath, len);
 	if (end > len)
 		end = len;
@@ -205,12 +204,15 @@ int udev_db_delete_device(struct udevice *udev)
 
 int udev_db_lookup_name(const char *name, char *devpath, size_t len)
 {
+	char dbpath[PATH_MAX];
 	DIR *dir;
 	int found = 0;
 
-	dir = opendir(udev_db_path);
+	strlcpy(dbpath, udev_root, sizeof(dbpath));
+	strlcat(dbpath, "/"DB_DIR, sizeof(dbpath));
+	dir = opendir(dbpath);
 	if (dir == NULL) {
-		err("unable to open udev_db '%s': %s", udev_db_path, strerror(errno));
+		err("unable to open udev_db '%s': %s", dbpath, strerror(errno));
 		return -1;
 	}
 
@@ -230,7 +232,7 @@ int udev_db_lookup_name(const char *name, char *devpath, size_t len)
 		if (ent->d_name[0] == '.')
 			continue;
 
-		snprintf(filename, sizeof(filename), "%s/%s", udev_db_path, ent->d_name);
+		snprintf(filename, sizeof(filename), "%s/%s", dbpath, ent->d_name);
 		filename[sizeof(filename)-1] = '\0';
 		dbg("looking at '%s'", filename);
 
@@ -274,11 +276,14 @@ int udev_db_lookup_name(const char *name, char *devpath, size_t len)
 
 int udev_db_get_all_entries(struct list_head *name_list)
 {
+	char dbpath[PATH_MAX];
 	DIR *dir;
 
-	dir = opendir(udev_db_path);
+	strlcpy(dbpath, udev_root, sizeof(dbpath));
+	strlcat(dbpath, "/"DB_DIR, sizeof(dbpath));
+	dir = opendir(dbpath);
 	if (dir == NULL) {
-		err("unable to open udev_db '%s': %s", udev_db_path, strerror(errno));
+		err("unable to open udev_db '%s': %s", dbpath, strerror(errno));
 		return -1;
 	}