X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevdb.c;h=95bc06ce6725669d9039fc8f9d4284d6f589173d;hb=c9043d4597692b5809a40a4aaa9d9b3bd7fadb35;hp=f9fca4ab70abf66c7fab39788420ea04a400658d;hpb=c80da5085f915bf6305e7ed6b786b63f6e9b14ea;p=elogind.git

diff --git a/udevdb.c b/udevdb.c
index f9fca4ab7..95bc06ce6 100644
--- a/udevdb.c
+++ b/udevdb.c
@@ -27,6 +27,7 @@
 #define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -53,7 +54,7 @@ int udevdb_add_dev(const char *path, const struct udevice *dev)
 		return -ENODEV;
 
 	memset(keystr, 0, NAME_SIZE);
-	strcpy(keystr, path);
+	strfieldcpy(keystr, path);
 	key.dptr = keystr;
 	key.dsize = strlen(keystr) + 1;
 
@@ -91,7 +92,7 @@ int udevdb_delete_dev(const char *path)
 		return -EINVAL;
 
 	memset(keystr, 0, sizeof(keystr));
-	strcpy(keystr, path);
+	strfieldcpy(keystr, path);
 
 	key.dptr = keystr;
 	key.dsize = strlen(keystr) + 1;
@@ -178,13 +179,29 @@ static int find_found;
 
 static int find_device_by_name(char *path, struct udevice *dev)
 {
+	int l, i, j;
 	if (strncmp(dev->name, find_name, sizeof(dev->name)) == 0) {
-		memcpy(find_dev, dev, sizeof(*find_dev));
-		strncpy(find_path, path, NAME_SIZE);
+		memcpy(find_dev, dev, sizeof(struct udevice));
+		strnfieldcpy(find_path, path, NAME_SIZE);
 		find_found = 1;
 		/* stop search */
 		return 1;
 	}
+	/* look for matching symlink*/
+	l = strlen(dev->symlink);
+	if (!l)
+		return 0;
+	i = j = 0;
+	do {
+		j = strcspn(&dev->symlink[i], " ");
+		if (j && strncmp(&dev->symlink[i], find_name, j) == 0) {
+			memcpy(find_dev, dev, sizeof(struct udevice));
+			strnfieldcpy(find_path, path, NAME_SIZE);
+			find_found = 1;
+			return 1;
+		}
+		i = i + j + 1;
+	} while (i < l);
 	return 0;
 }