X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevdb.c;h=22d439d6388d0bea47157e799309340bf2aef618;hp=a1f79a7c65b016b39bc0b0b295d8ef107252ecdd;hb=e4f9c4a46de499841939c51da1a1cf6fd5321bb1;hpb=c472e3c89b9aaad90ad6398c0d2ff5dcf5a9d238 diff --git a/udevdb.c b/udevdb.c index a1f79a7c6..22d439d63 100644 --- a/udevdb.c +++ b/udevdb.c @@ -27,6 +27,7 @@ #define _KLIBC_HAS_ARCH_SIG_ATOMIC_T #include #include +#include #include #include #include @@ -178,13 +179,28 @@ static int find_found; static int find_device_by_name(char *path, struct udevice *dev) { + int pos, 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)); + strnfieldcpy(find_path, path, NAME_SIZE); find_found = 1; /* stop search */ return 1; } + /* look for matching symlink*/ + foreach_strpart(dev->symlink, " ", pos, len) { + if (strncmp(&dev->symlink[pos], find_name, len) != 0) + continue; + + if (len != strlen(find_name)) + continue; + + memcpy(find_dev, dev, sizeof(struct udevice)); + strnfieldcpy(find_path, path, NAME_SIZE); + find_found = 1; + return 1; + } return 0; }