dnl /* libudev version */
LIBUDEV_LT_CURRENT=1
-LIBUDEV_LT_REVISION=0
+LIBUDEV_LT_REVISION=1
LIBUDEV_LT_AGE=1
AC_SUBST(LIBUDEV_LT_CURRENT)
AC_SUBST(LIBUDEV_LT_REVISION)
/* path is not a root directory */
subdir = &syspath[len+1];
pos = strrchr(subdir, '/');
- if (pos == NULL || pos < &subdir[2]) {
+ if (pos == NULL || pos[1] == '\0' || pos < &subdir[2]) {
dbg(udev, "not a subdir :%s\n", syspath);
return NULL;
}
if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) {
util_strlcpy(filename, udev_get_sys_path(udev), sizeof(filename));
util_strlcat(filename, syspath, sizeof(filename));
- syspath = filename;
+ } else {
+ util_strlcpy(filename, syspath, sizeof(filename));
}
+ util_remove_trailing_chars(filename, '/');
- dev = udev_device_new_from_syspath(udev, syspath);
+ dev = udev_device_new_from_syspath(udev, filename);
if (dev == NULL) {
- fprintf(stderr, "unable to open device '%s'\n", syspath);
+ fprintf(stderr, "unable to open device '%s'\n", filename);
rc = 2;
goto exit;
}