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

diff --git a/udevdb.c b/udevdb.c
index 95bc06ce6..f24693671 100644
--- a/udevdb.c
+++ b/udevdb.c
@@ -1,5 +1,5 @@
 /*
- * udevdb.c
+ * udevdb.c - udev database library
  *
  * Userspace devfs
  *
@@ -21,13 +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>
@@ -35,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"
@@ -60,6 +59,7 @@ int udevdb_add_dev(const char *path, const struct udevice *dev)
 
 	data.dptr = (void *)dev;
 	data.dsize = UDEVICE_LEN;
+	dbg("store key '%s' for device '%s'", path, dev->name);
 
 	return tdb_store(udevdb, key, data, TDB_REPLACE); 
 }
@@ -179,29 +179,29 @@ static int find_found;
 
 static int find_device_by_name(char *path, struct udevice *dev)
 {
-	int l, i, j;
+	char *pos;
+	int len;
+
 	if (strncmp(dev->name, find_name, sizeof(dev->name)) == 0) {
 		memcpy(find_dev, dev, sizeof(struct udevice));
-		strnfieldcpy(find_path, path, NAME_SIZE);
+		strfieldcpymax(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);
+	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;
 }