if (strcmp(dent->d_name, "uevent") == 0)
continue;
+ if (strcmp(dent->d_name, "dev") == 0)
+ continue;
strlcpy(filename, path, sizeof(filename));
strlcat(filename, "/", sizeof(filename));
len = strlcpy(value, attr_value, sizeof(value));
if(len >= sizeof(value))
len = sizeof(value) - 1;
- dbg("attr '%s'='%s'(%zi)", dent->d_name, value, len);
+ dbg("attr '%s'='%s'(%zi)\n", dent->d_name, value, len);
/* remove trailing newlines */
while (len && value[len-1] == '\n')
while (len && isprint(value[len-1]))
len--;
if (len) {
- dbg("attribute value of '%s' non-printable, skip", dent->d_name);
+ dbg("attribute value of '%s' non-printable, skip\n", dent->d_name);
continue;
}
- replace_chars(value, ALLOWED_CHARS_INPUT);
printf(" %s{%s}==\"%s\"\n", key, dent->d_name, value);
}
}
if (count <= 0)
goto out;
- info("found %i devices for '%s'", count, name);
+ info("found %i devices for '%s'\n", count, name);
/* select the device that seems to match */
list_for_each_entry(device, &name_list, node) {
udev_device_init(udev);
if (udev_db_get_device(udev, device->name) != 0)
continue;
- info("found db entry '%s'", device->name);
+ info("found db entry '%s'\n", device->name);
/* make sure, we don't get a link of a differnt device */
strlcpy(filename, udev_root, sizeof(filename));
if (stat(filename, &statbuf) != 0)
continue;
if (major(udev->devt) > 0 && udev->devt != statbuf.st_rdev) {
- info("skip '%s', dev_t doesn't match", udev->name);
+ info("skip '%s', dev_t doesn't match\n", udev->name);
continue;
}
rc = 0;
if (stat(name, &statbuf) != 0)
return -1;
- if (major(statbuf.st_dev) == 0)
- return -1;
-
printf("%d %d\n", major(statbuf.st_dev), minor(statbuf.st_dev));
return 0;
}
if (option == -1)
break;
- dbg("option '%c'", option);
+ dbg("option '%c'\n", option);
switch (option) {
case 'n':
/* remove /dev if given */
strlcpy(name, &optarg[strlen(udev_root)+1], sizeof(name));
else
strlcpy(name, optarg, sizeof(name));
- dbg("name: %s", name);
+ remove_trailing_chars(name, '/');
+ dbg("name: %s\n", name);
break;
case 'p':
/* remove /sys if given */
strlcpy(path, &optarg[strlen(sysfs_path)], sizeof(path));
else
strlcpy(path, optarg, sizeof(path));
- dbg("path: %s", path);
+ remove_trailing_chars(path, '/');
+
+ /* possibly resolve to real devpath */
+ if (sysfs_resolve_link(path, sizeof(path)) != 0) {
+ char temp[PATH_SIZE];
+ char *pos;
+
+ /* also check if the parent is a link */
+ strlcpy(temp, path, sizeof(temp));
+ pos = strrchr(temp, '/');
+ if (pos != 0) {
+ char tail[PATH_SIZE];
+
+ strlcpy(tail, pos, sizeof(tail));
+ pos[0] = '\0';
+ if (sysfs_resolve_link(temp, sizeof(temp)) == 0) {
+ strlcpy(path, temp, sizeof(path));
+ strlcat(path, tail, sizeof(path));
+ }
+ }
+ }
+ dbg("path: %s\n", path);
break;
case 'q':
action = ACTION_QUERY;