/*
- * udevdb.c
+ * udevdb.c - udev database library
*
* Userspace devfs
*
*
*/
-/*
- * 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>
#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"
if ((path == NULL) || (dev == NULL))
return -ENODEV;
- memset(keystr, 0, NAME_SIZE);
+ memset(keystr, 0, SYSFS_PATH_MAX);
strfieldcpy(keystr, path);
key.dptr = keystr;
key.dsize = strlen(keystr) + 1;
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);
}
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;
}