#include "udev.h"
-
-#ifdef USE_LOG
-void log_message (int priority, const char *format, ...)
-{
- va_list args;
-
- if (priority > udev_log_priority)
- return;
-
- va_start(args, format);
- vsyslog(priority, format, args);
- va_end(args);
-}
-#endif
-
static void print_all_attributes(const char *devpath, const char *key)
{
char path[PATH_SIZE];
if (dent->d_name[0] == '.')
continue;
+ 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));
strlcat(filename, dent->d_name, sizeof(filename));
if (attr_value == NULL)
continue;
len = strlcpy(value, attr_value, sizeof(value));
- dbg("attr '%s'='%s'(%zi)", dent->d_name, value, len);
+ if(len >= sizeof(value))
+ len = sizeof(value) - 1;
+ 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_untrusted_chars(value);
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);
}
static int lookup_device_by_name(struct udevice *udev, const char *name)
{
LIST_HEAD(name_list);
+ int count;
struct name_entry *device;
int rc = -1;
- if (udev_db_get_devices_by_name(name, &name_list) <= 0)
+ count = udev_db_get_devices_by_name(name, &name_list);
+ if (count <= 0)
goto out;
- /* select the device that matches the dev_t of 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) {
char filename[PATH_SIZE];
struct stat statbuf;
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));
strlcat(filename, "/", sizeof(filename));
strlcat(filename, name, sizeof(filename));
if (stat(filename, &statbuf) != 0)
continue;
- if (statbuf.st_rdev == udev->devt) {
- info("found '%s', dev_t matches", udev->name);
- rc = 0;
- break;
+ if (major(udev->devt) > 0 && udev->devt != statbuf.st_rdev) {
+ info("skip '%s', dev_t doesn't match\n", udev->name);
+ continue;
}
+ rc = 0;
+ break;
}
out:
name_list_cleanup(&name_list);
return rc;
}
-int main(int argc, char *argv[], char *envp[])
+static int stat_device(const char *name)
+{
+ struct stat statbuf;
+
+ if (stat(name, &statbuf) != 0)
+ return -1;
+
+ printf("%d %d\n", major(statbuf.st_dev), minor(statbuf.st_dev));
+ return 0;
+}
+
+int udevinfo(int argc, char *argv[], char *envp[])
{
int option;
struct udevice *udev;
{ "attribute-walk", 0, NULL, 'a' },
{ "export-db", 0, NULL, 'e' },
{ "root", 0, NULL, 'r' },
+ { "device-id-of-file", 1, NULL, 'd' },
{ "version", 0, NULL, 1 }, /* -V outputs braindead format */
{ "help", 0, NULL, 'h' },
{}
ACTION_QUERY,
ACTION_ATTRIBUTE_WALK,
ACTION_ROOT,
+ ACTION_DEVICE_ID_FILE,
} action = ACTION_NONE;
enum query_type {
goto exit;
}
- /* get command line options */
while (1) {
- option = getopt_long(argc, argv, "aen:p:q:rVh", options, NULL);
+ option = getopt_long(argc, argv, "aed:n:p:q:rVh", options, NULL);
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));
+ remove_trailing_chars(name, '/');
dbg("name: %s\n", name);
break;
case 'p':
strlcpy(path, &optarg[strlen(sysfs_path)], sizeof(path));
else
strlcpy(path, optarg, sizeof(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':
- dbg("udev query: %s\n", optarg);
action = ACTION_QUERY;
if (strcmp(optarg, "name") == 0) {
query = QUERY_NAME;
action = ACTION_ROOT;
root = 1;
break;
+ case 'd':
+ action = ACTION_DEVICE_ID_FILE;
+ strlcpy(name, optarg, sizeof(name));
+ break;
case 'a':
action = ACTION_ATTRIBUTE_WALK;
break;
printf("udevinfo, version %s\n", UDEV_VERSION);
goto exit;
case 'h':
- printf("Usage: udevinfo OPTIONS\n"
- " --query=<type> query database for the specified value:\n"
- " name name of device node\n"
- " symlink pointing to node\n"
- " path sysfs device path\n"
- " env the device related imported environment\n"
- " all all values\n"
- "\n"
- " --path=<devpath> sysfs device path used for query or chain\n"
- " --name=<name> node or symlink name used for query\n"
- "\n"
- " --root prepend to query result or print udev_root\n"
- " --attribute-walk print all SYSFS_attributes along the device chain\n"
- " --export-db export the content of the udev database\n"
- " --help print this text\n"
+ printf("Usage: udevadm info OPTIONS\n"
+ " --query=<type> query database for the specified value:\n"
+ " name name of device node\n"
+ " symlink pointing to node\n"
+ " path sysfs device path\n"
+ " env the device related imported environment\n"
+ " all all values\n"
+ " --path=<devpath> sysfs device path used for query or chain\n"
+ " --name=<name> node or symlink name used for query\n"
+ " --root prepend to query result or print udev_root\n"
+ " --attribute-walk print all key matches while walking along chain\n"
+ " of parent devices\n"
+ " --device-id-of-file=<file> print major/minor of underlying device\n"
+ " --export-db export the content of the udev database\n"
+ " --help print this text\n"
"\n");
goto exit;
default:
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;
}
goto exit;
}
break;
+ case ACTION_DEVICE_ID_FILE:
+ if (stat_device(name) != 0)
+ rc = 6;
+ break;
case ACTION_ROOT:
printf("%s\n", udev_root);
break;
~ianmdlvl / elogind.git / blobdiff