X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevdb.c;h=40580e5a3b885550abd794258e3aaff9e96dd63e;hp=a1f79a7c65b016b39bc0b0b295d8ef107252ecdd;hb=c2818554cee064360b8a3ed543fe30349096a74a;hpb=c472e3c89b9aaad90ad6398c0d2ff5dcf5a9d238

diff --git a/udevdb.c b/udevdb.c
index a1f79a7c6..40580e5a3 100644
--- a/udevdb.c
+++ b/udevdb.c
@@ -1,5 +1,5 @@
 /*
- * udevdb.c
+ * udevdb.c - udev database library
  *
  * Userspace devfs
  *
@@ -21,12 +21,11 @@
  *
  */
 
-/*
- * udev database library
- */
 #define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
+#include <stddef.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -34,8 +33,9 @@
 #include <signal.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
-#include "udev_version.h"
 #include "udev.h"
+#include "udev_lib.h"
+#include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
@@ -178,13 +178,29 @@ static int find_found;
 
 static int find_device_by_name(char *path, struct udevice *dev)
 {
+	char *pos;
+	int len;
+
 	if (strncmp(dev->name, find_name, sizeof(dev->name)) == 0) {
-		memcpy(find_dev, dev, sizeof(*find_dev));
-		strfieldcpy(find_path, path);
+		memcpy(find_dev, dev, sizeof(struct udevice));
+		strfieldcpymax(find_path, path, NAME_SIZE);
 		find_found = 1;
 		/* stop search */
 		return 1;
 	}
+	/* look for matching symlink*/
+	foreach_strpart(dev->symlink, " ", pos, len) {
+		if (strncmp(pos, find_name, len) != 0)
+			continue;
+
+		if (len != strlen(find_name))
+			continue;
+
+		memcpy(find_dev, dev, sizeof(struct udevice));
+		strfieldcpymax(find_path, path, NAME_SIZE);
+		find_found = 1;
+		return 1;
+	}
 	return 0;
 }