if (dent->d_name[0] == '.')
continue;
+ if (strcmp(dent->d_name, "uevent") == 0)
+ continue;
+
strlcpy(filename, path, sizeof(filename));
strlcat(filename, "/", sizeof(filename));
strlcat(filename, dent->d_name, sizeof(filename));
if (attr_value == NULL)
continue;
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);
/* remove trailing newlines */
continue;
}
- replace_untrusted_chars(value);
+ replace_chars(value, ALLOWED_CHARS_INPUT);
printf(" %s{%s}==\"%s\"\n", key, dent->d_name, value);
}
}
printf("P: %s\n", udev->dev->devpath);
printf("N: %s\n", udev->name);
- printf("L: %i\n", udev->link_priority);
list_for_each_entry(name_loop, &udev->symlink_list, node)
printf("S: %s\n", name_loop->name);
+ if (udev->link_priority != 0)
+ printf("L: %i\n", udev->link_priority);
+ if (udev->partitions != 0)
+ printf("A:%u\n", udev->partitions);
+ if (udev->ignore_remove)
+ printf("R:%u\n", udev->ignore_remove);
list_for_each_entry(name_loop, &udev->env_list, node)
printf("E: %s\n", name_loop->name);
}
goto exit;
}
- /* get command line options */
while (1) {
option = getopt_long(argc, argv, "aen:p:q:rVh", options, NULL);
if (option == -1)
strlcpy(name, &optarg[strlen(udev_root)+1], sizeof(name));
else
strlcpy(name, optarg, sizeof(name));
- dbg("name: %s\n", name);
+ dbg("name: %s", 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\n", path);
+ dbg("path: %s", path);
break;
case 'q':
- dbg("udev query: %s\n", optarg);
action = ACTION_QUERY;
if (strcmp(optarg, "name") == 0) {
query = QUERY_NAME;
printf("%s\n", udev->name);
break;
case QUERY_SYMLINK:
- if (list_empty(&udev->symlink_list))
- goto exit;
- if (root)
- list_for_each_entry(name_loop, &udev->symlink_list, node)
- printf("%s/%s ", udev_root, name_loop->name);
- else
- list_for_each_entry(name_loop, &udev->symlink_list, node)
- printf("%s ", name_loop->name);
- printf("\n");
+ list_for_each_entry(name_loop, &udev->symlink_list, node) {
+ char c = name_loop->node.next != &udev->symlink_list ? ' ' : '\n';
+
+ if (root)
+ printf("%s/%s%c", udev_root, name_loop->name, c);
+ else
+ printf("%s%c", name_loop->name, c);
+ }
break;
case QUERY_PATH:
printf("%s\n", udev->dev->devpath);
case ACTION_ATTRIBUTE_WALK:
if (path[0] != '\0') {
if (print_device_chain(path) != 0) {
- fprintf(stderr, "device not found\n");
+ fprintf(stderr, "no valid sysfs device found\n");
rc = 4;
goto exit;
}
goto exit;
}
if (print_device_chain(udev->dev->devpath) != 0) {
- fprintf(stderr, "device not found\n");
+ fprintf(stderr, "no valid sysfs device found\n");
rc = 4;
goto exit;
}