/*
- * Copyright (C) 2004-2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2009 Kay Sievers <kay@vrfy.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
static bool skip_attribute(const char *name)
{
- static const char const *skip[] = {
+ static const char* const skip[] = {
"uevent",
"dev",
"modalias",
};
unsigned int i;
- for (i = 0; i < ARRAY_SIZE(skip); i++)
- if (strcmp(name, skip[i]) == 0)
+ for (i = 0; i < ELEMENTSOF(skip); i++)
+ if (streq(name, skip[i]))
return true;
return false;
}
static void print_all_attributes(struct udev_device *device, const char *key)
{
- struct udev *udev = udev_device_get_udev(device);
struct udev_list_entry *sysattr;
udev_list_entry_foreach(sysattr, udev_device_get_sysattr_list_entry(device)) {
value = udev_device_get_sysattr_value(device, name);
if (value == NULL)
continue;
- dbg(udev, "attr '%s'='%s'\n", name, value);
/* skip any values that look like a path */
if (value[0] == '/')
len = strlen(value);
while (len > 0 && isprint(value[len-1]))
len--;
- if (len > 0) {
- dbg(udev, "attribute value of '%s' non-printable, skip\n", name);
+ if (len > 0)
continue;
- }
printf(" %s{%s}==\"%s\"\n", key, name, value);
}
static void print_record(struct udev_device *device)
{
- size_t len;
const char *str;
int i;
struct udev_list_entry *list_entry;
printf("P: %s\n", udev_device_get_devpath(device));
- len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
str = udev_device_get_devnode(device);
if (str != NULL)
- printf("N: %s\n", &str[len+1]);
+ printf("N: %s\n", str + strlen("/dev/"));
i = udev_device_get_devlink_priority(device);
if (i != 0)
printf("L: %i\n", i);
- udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device)) {
- len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
- printf("S: %s\n", &udev_list_entry_get_name(list_entry)[len+1]);
- }
+ udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device))
+ printf("S: %s\n", udev_list_entry_get_name(list_entry) + strlen("/dev/"));
udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(device))
printf("E: %s=%s\n",
static void cleanup_db(struct udev *udev)
{
- char filename[UTIL_PATH_SIZE];
DIR *dir;
- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/queue.bin", NULL);
- unlink(filename);
+ unlink("/run/udev/queue.bin");
- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/data", NULL);
- dir = opendir(filename);
+ dir = opendir("/run/udev/data");
if (dir != NULL) {
cleanup_dir(dir, S_ISVTX, 1);
closedir(dir);
}
- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/links", NULL);
- dir = opendir(filename);
+ dir = opendir("/run/udev/links");
if (dir != NULL) {
cleanup_dir(dir, 0, 2);
closedir(dir);
}
- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/tags", NULL);
- dir = opendir(filename);
+ dir = opendir("/run/udev/tags");
if (dir != NULL) {
cleanup_dir(dir, 0, 2);
closedir(dir);
}
- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/watch", NULL);
- dir = opendir(filename);
+ dir = opendir("/run/udev/static_node-tags");
if (dir != NULL) {
- cleanup_dir(dir, 0, 1);
+ cleanup_dir(dir, 0, 2);
closedir(dir);
}
- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/firmware-missing", NULL);
- dir = opendir(filename);
+ dir = opendir("/run/udev/watch");
if (dir != NULL) {
cleanup_dir(dir, 0, 1);
closedir(dir);
}
}
+static struct udev_device *find_device(struct udev *udev, const char *id, const char *prefix)
+{
+ char name[UTIL_PATH_SIZE];
+
+ if (prefix && !startswith(id, prefix)) {
+ strscpyl(name, sizeof(name), prefix, id, NULL);
+ id = name;
+ }
+
+ if (startswith(id, "/dev/")) {
+ struct stat statbuf;
+ char type;
+
+ if (stat(id, &statbuf) < 0)
+ return NULL;
+
+ if (S_ISBLK(statbuf.st_mode))
+ type = 'b';
+ else if (S_ISCHR(statbuf.st_mode))
+ type = 'c';
+ else
+ return NULL;
+
+ return udev_device_new_from_devnum(udev, type, statbuf.st_rdev);
+ } else if (startswith(id, "/sys/"))
+ return udev_device_new_from_syspath(udev, id);
+ else
+ return NULL;
+}
+
static int uinfo(struct udev *udev, int argc, char *argv[])
{
struct udev_device *device = NULL;
bool root = 0;
bool export = 0;
const char *export_prefix = NULL;
- char path[UTIL_PATH_SIZE];
char name[UTIL_PATH_SIZE];
struct udev_list_entry *list_entry;
int rc = 0;
{ "cleanup-db", no_argument, NULL, 'c' },
{ "export-db", no_argument, NULL, 'e' },
{ "root", no_argument, NULL, 'r' },
- { "run", no_argument, NULL, 'R' },
{ "device-id-of-file", required_argument, NULL, 'd' },
{ "export", no_argument, NULL, 'x' },
{ "export-prefix", required_argument, NULL, 'P' },
{}
};
+ static const char *usage =
+ "Usage: udevadm info OPTIONS\n"
+ " --query=<type> query device information:\n"
+ " name name of device node\n"
+ " symlink pointing to node\n"
+ " path sys device path\n"
+ " property the device properties\n"
+ " all all values\n"
+ " --path=<syspath> sys device path used for query or attribute walk\n"
+ " --name=<name> node or symlink name used for query or attribute walk\n"
+ " --root prepend dev directory to path names\n"
+ " --attribute-walk print all key matches while walking along the chain\n"
+ " of parent devices\n"
+ " --device-id-of-file=<file> print major:minor of device containing this file\n"
+ " --export export key/value pairs\n"
+ " --export-prefix export the key name with a prefix\n"
+ " --export-db export the content of the udev database\n"
+ " --cleanup-db cleanup the udev database\n"
+ " --help\n";
+
enum action_type {
- ACTION_NONE,
ACTION_QUERY,
ACTION_ATTRIBUTE_WALK,
- ACTION_ROOT,
ACTION_DEVICE_ID_FILE,
- } action = ACTION_NONE;
+ } action = ACTION_QUERY;
enum query_type {
- QUERY_NONE,
QUERY_NAME,
QUERY_PATH,
QUERY_SYMLINK,
QUERY_PROPERTY,
QUERY_ALL,
- } query = QUERY_NONE;
+ } query = QUERY_ALL;
for (;;) {
int option;
- struct stat statbuf;
option = getopt_long(argc, argv, "aced:n:p:q:rxP:RVh", options, NULL);
if (option == -1)
break;
- dbg(udev, "option '%c'\n", option);
switch (option) {
- case 'n':
+ case 'n': {
if (device != NULL) {
fprintf(stderr, "device already specified\n");
rc = 2;
goto exit;
}
- /* remove /dev if given */
- if (strncmp(optarg, udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) != 0)
- util_strscpyl(name, sizeof(name), udev_get_dev_path(udev), "/", optarg, NULL);
- else
- util_strscpy(name, sizeof(name), optarg);
- util_remove_trailing_chars(name, '/');
- if (stat(name, &statbuf) < 0) {
+
+ device = find_device(udev, optarg, "/dev/");
+ if (device == NULL) {
fprintf(stderr, "device node not found\n");
rc = 2;
goto exit;
- } else {
- char type;
-
- if (S_ISBLK(statbuf.st_mode)) {
- type = 'b';
- } else if (S_ISCHR(statbuf.st_mode)) {
- type = 'c';
- } else {
- fprintf(stderr, "device node has wrong file type\n");
- rc = 2;
- goto exit;
- }
- device = udev_device_new_from_devnum(udev, type, statbuf.st_rdev);
- if (device == NULL) {
- fprintf(stderr, "device node not found\n");
- rc = 2;
- goto exit;
- }
}
break;
+ }
case 'p':
if (device != NULL) {
fprintf(stderr, "device already specified\n");
rc = 2;
goto exit;
}
- /* add sys dir if needed */
- if (strncmp(optarg, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0)
- util_strscpyl(path, sizeof(path), udev_get_sys_path(udev), optarg, NULL);
- else
- util_strscpy(path, sizeof(path), optarg);
- util_remove_trailing_chars(path, '/');
- device = udev_device_new_from_syspath(udev, path);
+
+ device = find_device(udev, optarg, "/sys");
if (device == NULL) {
- fprintf(stderr, "device path not found\n");
+ fprintf(stderr, "syspath not found\n");
rc = 2;
goto exit;
}
break;
case 'q':
action = ACTION_QUERY;
- if (strcmp(optarg, "property") == 0 || strcmp(optarg, "env") == 0) {
+ if (streq(optarg, "property") || streq(optarg, "env")) {
query = QUERY_PROPERTY;
- } else if (strcmp(optarg, "name") == 0) {
+ } else if (streq(optarg, "name")) {
query = QUERY_NAME;
- } else if (strcmp(optarg, "symlink") == 0) {
+ } else if (streq(optarg, "symlink")) {
query = QUERY_SYMLINK;
- } else if (strcmp(optarg, "path") == 0) {
+ } else if (streq(optarg, "path")) {
query = QUERY_PATH;
- } else if (strcmp(optarg, "all") == 0) {
+ } else if (streq(optarg, "all")) {
query = QUERY_ALL;
} else {
fprintf(stderr, "unknown query type\n");
}
break;
case 'r':
- if (action == ACTION_NONE)
- action = ACTION_ROOT;
root = true;
break;
- case 'R':
- printf("%s\n", udev_get_run_path(udev));
- goto exit;
case 'd':
action = ACTION_DEVICE_ID_FILE;
- util_strscpy(name, sizeof(name), optarg);
+ strscpy(name, sizeof(name), optarg);
break;
case 'a':
action = ACTION_ATTRIBUTE_WALK;
printf("%s\n", VERSION);
goto exit;
case 'h':
- printf("Usage: udevadm info OPTIONS\n"
- " --query=<type> query device information:\n"
- " name name of device node\n"
- " symlink pointing to node\n"
- " path sys device path\n"
- " property the device properties\n"
- " all all values\n"
- " --path=<syspath> sys device path used for query or attribute walk\n"
- " --name=<name> node or symlink name used for query or attribute walk\n"
- " --root prepend dev directory to path names\n"
- " --attribute-walk print all key matches while walking along the chain\n"
- " of parent devices\n"
- " --device-id-of-file=<file> print major:minor of device containing this file\n"
- " --export export key/value pairs\n"
- " --export-prefix export the key name with a prefix\n"
- " --export-db export the content of the udev database\n"
- " --cleanup-db cleanup the udev database\n"
- " --help\n\n");
+ printf("%s\n", usage);
goto exit;
default:
rc = 1;
switch (action) {
case ACTION_QUERY:
- if (device == NULL) {
- fprintf(stderr, "query needs a valid device specified by --path= or --name=\n");
- rc = 4;
- goto exit;
+ if (!device) {
+ if (!argv[optind]) {
+ fprintf(stderr, "%s\n", usage);
+ rc = 2;
+ goto exit;
+ }
+ device = find_device(udev, argv[optind], NULL);
+ if (!device) {
+ fprintf(stderr, "Unknown device, --name=, --path=, or absolute path in /dev/ or /sys expected.\n");
+ rc = 4;
+ goto exit;
+ }
}
switch(query) {
goto exit;
}
- if (root) {
+ if (root)
printf("%s\n", udev_device_get_devnode(device));
- } else {
- size_t len = strlen(udev_get_dev_path(udev));
-
- printf("%s\n", &udev_device_get_devnode(device)[len+1]);
- }
+ else
+ printf("%s\n", udev_device_get_devnode(device) + strlen("/dev/"));
break;
}
case QUERY_SYMLINK:
list_entry = udev_device_get_devlinks_list_entry(device);
while (list_entry != NULL) {
- if (root) {
+ if (root)
printf("%s", udev_list_entry_get_name(list_entry));
- } else {
- size_t len;
-
- len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
- printf("%s", &udev_list_entry_get_name(list_entry)[len+1]);
- }
+ else
+ printf("%s", udev_list_entry_get_name(list_entry) + strlen("/dev/"));
list_entry = udev_list_entry_get_next(list_entry);
if (list_entry != NULL)
printf(" ");
}
break;
case ACTION_ATTRIBUTE_WALK:
- if (device == NULL) {
- fprintf(stderr, "query needs a valid device specified by --path= or --name=\n");
+ if (!device && argv[optind]) {
+ device = find_device(udev, argv[optind], NULL);
+ if (!device) {
+ fprintf(stderr, "Unknown device, absolute path in /dev/ or /sys expected.\n");
+ rc = 4;
+ goto exit;
+ }
+ }
+ if (!device) {
+ fprintf(stderr, "Unknown device, --name=, --path=, or absolute path in /dev/ or /sys expected.\n");
rc = 4;
goto exit;
}
if (stat_device(name, export, export_prefix) != 0)
rc = 1;
break;
- case ACTION_ROOT:
- printf("%s\n", udev_get_dev_path(udev));
- break;
- default:
- fprintf(stderr, "missing option\n");
- rc = 1;
- break;
}
exit:
~ianmdlvl / elogind.git / blobdiff