X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_db.c;h=9b40a5904e751d531490e8cc2398a8c499b2ef2f;hb=3ad7a5b1a562ba71bea91ae3fba48e5b5947e285;hp=6f10b1e58d1318c998f7151caffc43c8d16b33bf;hpb=25103c4849d3bdee38d22e08c65cd60cf5d5bcc4;p=elogind.git

diff --git a/udev_db.c b/udev_db.c
index 6f10b1e58..9b40a5904 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -1,8 +1,6 @@
 /*
  * udev_db.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
@@ -115,7 +113,7 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 	size_t count;
 
 	if (file_map(filename, &buf, &bufsize) != 0) {
-		err("unable to read db file '%s'", filename);
+		dbg("no db file to read '%s'", filename);
 		return -1;
 	}
 
@@ -129,42 +127,49 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 		case 'P':
 			if (count > sizeof(udev->devpath))
 				count = sizeof(udev->devpath);
-			strlcpy(udev->devpath, &bufline[2], count-1);
+			memcpy(udev->devpath, &bufline[2], count-2);
+			udev->devpath[count-2] = '\0';
 			break;
 		case 'N':
 			if (count > sizeof(udev->name))
 				count = sizeof(udev->name);
-			strlcpy(udev->name, &bufline[2], count-1);
+			memcpy(udev->name, &bufline[2], count-2);
+			udev->name[count-2] = '\0';
 			break;
 		case 'M':
 			if (count > sizeof(line))
 				count = sizeof(line);
-			strlcpy(line, &bufline[2], count-1);
+			memcpy(line, &bufline[2], count-2);
+			line[count-2] = '\0';
 			sscanf(line, "%u:%u", &major, &minor);
 			udev->devt = makedev(major, minor);
 			break;
 		case 'S':
 			if (count > sizeof(line))
 				count =  sizeof(line);
-			strlcpy(line, &bufline[2], count-1);
+			memcpy(line, &bufline[2], count-2);
+			line[count-2] = '\0';
 			name_list_add(&udev->symlink_list, line, 0);
 			break;
 		case 'A':
 			if (count > sizeof(line))
 				count =  sizeof(line);
-			strlcpy(line, &bufline[2], count-1);
+			memcpy(line, &bufline[2], count-2);
+			line[count-2] = '\0';
 			udev->partitions = atoi(line);
 			break;
 		case 'R':
 			if (count > sizeof(line))
 				count =  sizeof(line);
-			strlcpy(line, &bufline[2], count-1);
+			memcpy(line, &bufline[2], count-2);
+			line[count-2] = '\0';
 			udev->ignore_remove = atoi(line);
 			break;
 		case 'E':
 			if (count > sizeof(line))
 				count =  sizeof(line);
-			strlcpy(line, &bufline[2], count-1);
+			memcpy(line, &bufline[2], count-2);
+			line[count-2] = '\0';
 			name_list_add(&udev->env_list, line, 0);
 			break;
 		}
@@ -202,6 +207,8 @@ int udev_db_get_device(struct udevice *udev, const char *devpath)
 int udev_db_search_name(char *devpath, size_t len, const char *name)
 {
 	DIR *dir;
+	char path[PATH_SIZE];
+	int found = 0;
 
 	dir = opendir(udev_db_path);
 	if (dir == NULL) {
@@ -209,10 +216,9 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
 		return -1;
 	}
 
-	while (1) {
+	while (!found) {
 		struct dirent *ent;
 		char filename[PATH_SIZE];
-		char path[PATH_SIZE];
 		char nodename[PATH_SIZE];
 		char *bufline;
 		char *buf;
@@ -237,7 +243,7 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
 		}
 
 		cur = 0;
-		while (cur < bufsize) {
+		while (cur < bufsize && !found) {
 			count = buf_get_line(buf, bufsize, cur);
 			bufline = &buf[cur];
 			cur += count+1;
@@ -246,19 +252,19 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
 			case 'P':
 				if (count > sizeof(path))
 					count = sizeof(path);
-				strlcpy(path, &bufline[2], count-1);
+				memcpy(path, &bufline[2], count-2);
+				path[count-2] = '\0';
 				break;
 			case 'N':
 			case 'S':
 				if (count > sizeof(nodename))
 					count = sizeof(nodename);
-				strlcpy(nodename, &bufline[2], count-1);
+				memcpy(nodename, &bufline[2], count-2);
+				nodename[count-2] = '\0';
 				dbg("compare '%s' '%s'", nodename, name);
 				if (strcmp(nodename, name) == 0) {
-					strlcpy(devpath, path, len);
-					file_unmap(buf, bufsize);
-					closedir(dir);
-					return 0;
+					found = 1;
+					break;
 				}
 				break;
 			default:
@@ -269,7 +275,11 @@ int udev_db_search_name(char *devpath, size_t len, const char *name)
 	}
 
 	closedir(dir);
-	return -1;
+	if (found) {
+		strlcpy(devpath, path, len);
+		return 0;
+	} else
+		return -1;
 }
 
 int udev_db_dump_names(int (*handler_function)(const char *path, const char *name))
@@ -321,12 +331,14 @@ int udev_db_dump_names(int (*handler_function)(const char *path, const char *nam
 			case 'P':
 				if (count > sizeof(path))
 					count = sizeof(path);
-				strlcpy(path, &bufline[2], count-1);
+				memcpy(path, &bufline[2], count-2);
+				path[count-2] = '\0';
 				break;
 			case 'N':
 				if (count > sizeof(nodename))
 					count = sizeof(nodename);
-				strlcpy(nodename, &bufline[2], count-1);
+				memcpy(nodename, &bufline[2], count-2);
+				nodename[count-2] = '\0';
 				break;
 			default:
 				continue;