X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=afbd50e50fc00fdfb9fa1948a209f0d8ec2893b4;hp=1015d21221782b3347b3e02049b743a3e3978e00;hb=197178360f5c4253aeb743b32224125e58e2fd5d;hpb=e48fc108d9731f6f091742fe6588c495d1948fac

diff --git a/udev_db.c b/udev_db.c
index 1015d2122..afbd50e50 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -26,12 +26,14 @@
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 #include <dirent.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
 #include "logging.h"
@@ -41,11 +43,11 @@
 
 static int get_db_filename(const char *devpath, char *filename, int len)
 {
-	char temp[SYSFS_PATH_MAX];
+	char temp[PATH_SIZE];
 	char *pos;
 
 	/* replace '/' to transform path into a filename */
-	strfieldcpy(temp, devpath);
+	strlcpy(temp, devpath, sizeof(temp));
 	pos = strchr(&temp[1], '/');
 	while (pos) {
 		pos[0] = PATH_TO_NAME_CHAR;
@@ -59,20 +61,20 @@ static int get_db_filename(const char *devpath, char *filename, int len)
 
 int udev_db_add_device(struct udevice *udev)
 {
-	char filename[SYSFS_PATH_MAX];
+	char filename[PATH_SIZE];
 	struct name_entry *name_loop;
 	FILE *f;
 
 	if (udev->test_run)
 		return 0;
 
-	get_db_filename(udev->devpath, filename, SYSFS_PATH_MAX);
+	get_db_filename(udev->devpath, filename, sizeof(filename));
 
 	create_path(filename);
 
 	f = fopen(filename, "w");
 	if (f == NULL) {
-		dbg("unable to create db file '%s'", filename);
+		err("unable to create db file '%s'", filename);
 		return -1;
 	}
 	dbg("storing data for device '%s' in '%s'", udev->devpath, filename);
@@ -92,8 +94,7 @@ int udev_db_add_device(struct udevice *udev)
 
 static int parse_db_file(struct udevice *udev, const char *filename)
 {
-	char line[NAME_SIZE];
-	char temp[NAME_SIZE];
+	char line[PATH_SIZE];
 	unsigned int major, minor;
 	char *bufline;
 	char *buf;
@@ -102,7 +103,7 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 	size_t count;
 
 	if (file_map(filename, &buf, &bufsize) != 0) {
-		dbg("unable to read db file '%s'", filename);
+		err("unable to read db file '%s'", filename);
 		return -1;
 	}
 
@@ -114,44 +115,38 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 
 		switch(bufline[0]) {
 		case 'P':
-			if (count > DEVPATH_SIZE)
-				count = DEVPATH_SIZE-1;
-			strncpy(udev->devpath, &bufline[2], count-2);
-			udev->devpath[count-2] = '\0';
+			if (count > sizeof(udev->devpath))
+				count = sizeof(udev->devpath);
+			strlcpy(udev->devpath, &bufline[2], count-1);
 			break;
 		case 'N':
-			if (count > NAME_SIZE)
-				count = NAME_SIZE-1;
-			strncpy(udev->name, &bufline[2], count-2);
-			udev->name[count-2] = '\0';
+			if (count > sizeof(udev->name))
+				count = sizeof(udev->name);
+			strlcpy(udev->name, &bufline[2], count-1);
 			break;
 		case 'M':
-			if (count > NAME_SIZE)
-				count = NAME_SIZE-1;
-			strncpy(temp, &bufline[2], count-2);
-			temp[count-2] = '\0';
-			sscanf(temp, "%u:%u", &major, &minor);
+			if (count > sizeof(line))
+				count = sizeof(line);
+			strlcpy(line, &bufline[2], count-1);
+			sscanf(line, "%u:%u", &major, &minor);
 			udev->devt = makedev(major, minor);
 			break;
 		case 'S':
-			if (count > NAME_SIZE)
-				count = NAME_SIZE-1;
-			strncpy(temp, &bufline[2], count-2);
-			temp[count-2] = '\0';
-			name_list_add(&udev->symlink_list, temp, 0);
+			if (count > sizeof(line))
+				count =  sizeof(line);
+			strlcpy(line, &bufline[2], count-1);
+			name_list_add(&udev->symlink_list, line, 0);
 			break;
 		case 'A':
-			if (count > NAME_SIZE)
-				count = NAME_SIZE-1;
-			strncpy(line, &bufline[2], count-2);
-			line[count-2] = '\0';
+			if (count > sizeof(line))
+				count =  sizeof(line);
+			strlcpy(line, &bufline[2], count-1);
 			udev->partitions = atoi(line);
 			break;
 		case 'R':
-			if (count > NAME_SIZE)
-				count = NAME_SIZE-1;
-			strncpy(line, &bufline[2], count-2);
-			line[count-2] = '\0';
+			if (count > sizeof(line))
+				count =  sizeof(line);
+			strlcpy(line, &bufline[2], count-1);
 			udev->ignore_remove = atoi(line);
 			break;
 		}
@@ -166,9 +161,9 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 
 int udev_db_delete_device(struct udevice *udev)
 {
-	char filename[SYSFS_PATH_MAX];
+	char filename[PATH_SIZE];
 
-	get_db_filename(udev->devpath, filename, SYSFS_PATH_MAX);
+	get_db_filename(udev->devpath, filename, sizeof(filename));
 	unlink(filename);
 
 	return 0;
@@ -176,9 +171,9 @@ int udev_db_delete_device(struct udevice *udev)
 
 int udev_db_get_device(struct udevice *udev, const char *devpath)
 {
-	char filename[SYSFS_PATH_MAX];
+	char filename[PATH_SIZE];
 
-	get_db_filename(devpath, filename, SYSFS_PATH_MAX);
+	get_db_filename(devpath, filename, sizeof(filename));
 
 	if (parse_db_file(udev, filename) != 0)
 		return -1;
@@ -188,19 +183,19 @@ int udev_db_get_device(struct udevice *udev, const char *devpath)
 
 int udev_db_search_name(char *devpath, size_t len, const char *name)
 {
-	struct dirent *ent;
 	DIR *dir;
-	char filename[NAME_SIZE];
 
 	dir = opendir(udev_db_path);
 	if (dir == NULL) {
-		dbg("unable to udev db '%s'", udev_db_path);
+		err("unable to open udev_db '%s'", udev_db_path);
 		return -1;
 	}
 
 	while (1) {
-		char path[DEVPATH_SIZE];
-		char nodename[NAME_SIZE];
+		struct dirent *ent;
+		char filename[PATH_SIZE];
+		char path[PATH_SIZE];
+		char nodename[PATH_SIZE];
 		char *bufline;
 		char *buf;
 		size_t bufsize;
@@ -214,12 +209,12 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
 		if (ent->d_name[0] == '.')
 			continue;
 
-		snprintf(filename, NAME_SIZE, "%s/%s", udev_db_path, ent->d_name);
-		filename[NAME_SIZE-1] = '\0';
+		snprintf(filename, sizeof(filename), "%s/%s", udev_db_path, ent->d_name);
+		filename[sizeof(filename)-1] = '\0';
 		dbg("looking at '%s'", filename);
 
 		if (file_map(filename, &buf, &bufsize) != 0) {
-			dbg("unable to read db file '%s'", filename);
+			err("unable to read db file '%s'", filename);
 			continue;
 		}
 
@@ -231,21 +226,18 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
 
 			switch(bufline[0]) {
 			case 'P':
-				if (count > DEVPATH_SIZE)
-					count = DEVPATH_SIZE-1;
-				strncpy(path, &bufline[2], count-2);
-				path[count-2] = '\0';
+				if (count > sizeof(path))
+					count = sizeof(path);
+				strlcpy(path, &bufline[2], count-1);
 				break;
 			case 'N':
 			case 'S':
-				if (count > NAME_SIZE)
-				count = NAME_SIZE-1;
-				strncpy(nodename, &bufline[2], count-2);
-				nodename[count-2] = '\0';
+				if (count > sizeof(nodename))
+					count = sizeof(nodename);
+				strlcpy(nodename, &bufline[2], count-1);
 				dbg("compare '%s' '%s'", nodename, name);
 				if (strcmp(nodename, name) == 0) {
-					strncpy(devpath, path, len);
-					devpath[len] = '\0';
+					strlcpy(devpath, path, len);
 					file_unmap(buf, bufsize);
 					closedir(dir);
 					return 0;
@@ -262,20 +254,27 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
 	return -1;
 }
 
-int udev_db_call_foreach(int (*handler_function)(struct udevice *udev))
+int udev_db_dump_names(int (*handler_function)(const char *path, const char *name))
 {
-	struct dirent *ent;
 	DIR *dir;
-	char filename[NAME_SIZE];
-	struct udevice db_udev;
 
 	dir = opendir(udev_db_path);
 	if (dir == NULL) {
-		dbg("unable to udev db '%s'", udev_db_path);
+		err("unable to open udev_db '%s'", udev_db_path);
 		return -1;
 	}
 
 	while (1) {
+		struct dirent *ent;
+		char filename[PATH_SIZE];
+		char path[PATH_SIZE];
+		char nodename[PATH_SIZE];
+		char *bufline;
+		char *buf;
+		size_t bufsize;
+		size_t cur;
+		size_t count;
+
 		ent = readdir(dir);
 		if (ent == NULL || ent->d_name[0] == '\0')
 			break;
@@ -283,16 +282,45 @@ int udev_db_call_foreach(int (*handler_function)(struct udevice *udev))
 		if (ent->d_name[0] == '.')
 			continue;
 
-		snprintf(filename, NAME_SIZE, "%s/%s", udev_db_path, ent->d_name);
-		filename[NAME_SIZE-1] = '\0';
+		snprintf(filename, sizeof(filename), "%s/%s", udev_db_path, ent->d_name);
+		filename[sizeof(filename)-1] = '\0';
+		dbg("looking at '%s'", filename);
+
+		if (file_map(filename, &buf, &bufsize) != 0) {
+			err("unable to read db file '%s'", filename);
+			continue;
+		}
 
-		dbg("found '%s'", filename);
+		path[0] = '\0';
+		nodename[0] = '\0';
+		cur = 0;
+		while (cur < bufsize) {
+			count = buf_get_line(buf, bufsize, cur);
+			bufline = &buf[cur];
+			cur += count+1;
 
-		udev_init_device(&db_udev, NULL, NULL);
-		if (parse_db_file(&db_udev, filename) == 0) {
-			if (handler_function(&db_udev) != 0)
+			switch(bufline[0]) {
+			case 'P':
+				if (count > sizeof(path))
+					count = sizeof(path);
+				strlcpy(path, &bufline[2], count-1);
 				break;
+			case 'N':
+				if (count > sizeof(nodename))
+					count = sizeof(nodename);
+				strlcpy(nodename, &bufline[2], count-1);
+				break;
+			default:
+				continue;
+			}
 		}
+		file_unmap(buf, bufsize);
+
+		if (path[0] == '\0' || nodename[0] == '\0')
+			continue;
+
+		if (handler_function(path, nodename) != 0)
+			break;
 	}
 
 	closedir(dir);