X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=b668655f29ec21e6a739c9dbdee65bd1ae48592e;hp=097c91c21b9db82839786d9f1fdcfa371b759fd3;hb=2321ba6fd89635f321ec08fa3803aa7e20aa76bf;hpb=e4ad54a302773d8b1c197e32fe67541f1b60518e diff --git a/udevinfo.c b/udevinfo.c index 097c91c21..b668655f2 100644 --- a/udevinfo.c +++ b/udevinfo.c @@ -1,8 +1,7 @@ /* - * udevinfo - fetches attributes for a device - * - * Copyright (C) 2004 Kay Sievers + * udevinfo.c - fetches stored device information or sysfs attributes * + * Copyright (C) 2004-2005 Kay Sievers * * 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 the @@ -28,112 +27,84 @@ #include #include "libsysfs/sysfs/libsysfs.h" -#include "libsysfs/dlist.h" +#include "udev_libc_wrapper.h" #include "udev.h" -#include "udev_lib.h" +#include "udev_utils.h" #include "udev_version.h" #include "udev_db.h" #include "logging.h" -#define SYSFS_VALUE_SIZE 256 - -#ifdef LOG -unsigned char logname[LOGNAME_SIZE]; -void log_message (int level, const char *format, ...) +#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(level, format, args); + vsyslog(priority, format, args); va_end(args); } #endif -static int print_all_attributes(const char *path) +static void print_all_attributes(struct dlist *attr_list) { - struct dlist *attributes; struct sysfs_attribute *attr; - struct sysfs_directory *sysfs_dir; - char value[SYSFS_VALUE_SIZE]; - int len; - int retval = 0; - - sysfs_dir = sysfs_open_directory(path); - if (sysfs_dir == NULL) - return -1; - - attributes = sysfs_get_dir_attributes(sysfs_dir); - if (attributes == NULL) { - retval = -1; - goto exit; - } + char value[VALUE_SIZE]; + size_t len; - dlist_for_each_data(attributes, attr, struct sysfs_attribute) { - if (attr->value != NULL) { - strfieldcpy(value, attr->value); - len = strlen(value); - if (len == 0) - continue; - - /* remove trailing newline */ - if (value[len-1] == '\n') { - value[len-1] = '\0'; - len--; - } + dlist_for_each_data(attr_list, attr, struct sysfs_attribute) { + if (attr->value == NULL) + continue; + len = strlcpy(value, attr->value, sizeof(value)); + if (len >= sizeof(value)) { + dbg("attribute value of '%s' too long, skip", attr->name); + continue; + } - /* skip nonprintable values */ - while (len) { - if (isprint(value[len-1]) == 0) - break; - len--; - } - if (len == 0) - printf(" SYSFS{%s}=\"%s\"\n", attr->name, value); + /* remove trailing newlines */ + while (len && value[len-1] == '\n') + value[--len] = '\0'; + /* skip nonprintable attributes */ + while (len && isprint(value[len-1])) + len--; + if (len) { + dbg("attribute value of '%s' non-printable, skip", attr->name); + continue; } + replace_untrusted_chars(value); + printf(" SYSFS{%s}==\"%s\"\n", attr->name, value); } printf("\n"); - -exit: - sysfs_close_directory(sysfs_dir); - - return retval; } -static int print_record(struct udevice *udev) +static void print_record(struct udevice *udev) { + struct name_entry *name_loop; + printf("P: %s\n", udev->devpath); printf("N: %s\n", udev->name); - printf("S: %s\n", udev->symlink); - printf("\n"); - return 0; + list_for_each_entry(name_loop, &udev->symlink_list, node) + printf("S: %s\n", name_loop->name); + list_for_each_entry(name_loop, &udev->env_list, node) + printf("E: %s\n", name_loop->name); } -enum query_type { - NONE, - NAME, - PATH, - SYMLINK, - ALL -}; - static int print_device_chain(const char *path) { struct sysfs_class_device *class_dev; struct sysfs_class_device *class_dev_parent; struct sysfs_attribute *attr; struct sysfs_device *sysfs_dev; - struct sysfs_device *sysfs_dev_parent; + struct dlist *attr_list; int retval = 0; - char type; - - type = get_device_type(path, ""); - dbg("device type is %c", type); /* get the class dev */ class_dev = sysfs_open_class_device_path(path); if (class_dev == NULL) { - printf("couldn't get the class device\n"); + fprintf(stderr, "couldn't get the class device\n"); return -1; } @@ -144,49 +115,50 @@ static int print_device_chain(const char *path) "to match the device for which the node will be created.\n" "\n"); - if (type == 'b' || type =='c') { - /* read the 'dev' file for major/minor*/ - attr = sysfs_get_classdev_attr(class_dev, "dev"); - if (attr == NULL) { - printf("couldn't get the \"dev\" file\n"); - retval = -1; - goto exit; - } + /* look for the 'dev' file */ + attr = sysfs_get_classdev_attr(class_dev, "dev"); + if (attr != NULL) printf("device '%s' has major:minor %s", class_dev->path, attr->value); - } /* open sysfs class device directory and print all attributes */ printf(" looking at class device '%s':\n", class_dev->path); - if (print_all_attributes(class_dev->path) != 0) { - printf("couldn't open class device directory\n"); + printf(" KERNEL==\"%s\"\n", class_dev->name); + printf(" SUBSYSTEM==\"%s\"\n", class_dev->classname); + + attr_list = sysfs_get_classdev_attributes(class_dev); + if (attr_list == NULL) { + fprintf(stderr, "couldn't open class device directory\n"); retval = -1; goto exit; } + print_all_attributes(attr_list); /* get the device link (if parent exists look here) */ class_dev_parent = sysfs_get_classdev_parent(class_dev); - if (class_dev_parent != NULL) + if (class_dev_parent != NULL) sysfs_dev = sysfs_get_classdev_device(class_dev_parent); else sysfs_dev = sysfs_get_classdev_device(class_dev); if (sysfs_dev != NULL) - printf("follow the class device's \"device\"\n"); + printf("follow the \"device\"-link to the physical device:\n"); /* look the device chain upwards */ while (sysfs_dev != NULL) { printf(" looking at the device chain at '%s':\n", sysfs_dev->path); - printf(" BUS=\"%s\"\n", sysfs_dev->bus); - printf(" ID=\"%s\"\n", sysfs_dev->bus_id); - - /* open sysfs device directory and print all attributes */ - print_all_attributes(sysfs_dev->path); + printf(" BUS==\"%s\"\n", sysfs_dev->bus); + printf(" ID==\"%s\"\n", sysfs_dev->bus_id); + printf(" DRIVER==\"%s\"\n", sysfs_dev->driver_name); + + attr_list = sysfs_get_device_attributes(sysfs_dev); + if (attr_list != NULL) + print_all_attributes(attr_list); + else + printf("\n"); - sysfs_dev_parent = sysfs_get_device_parent(sysfs_dev); - if (sysfs_dev_parent == NULL) + sysfs_dev = sysfs_get_device_parent(sysfs_dev); + if (sysfs_dev == NULL) break; - - sysfs_dev = sysfs_dev_parent; } exit: @@ -194,76 +166,86 @@ exit: return retval; } -/* print all class/main block devices with major/minor, physical device, driver and bus */ -static int print_sysfs_devices(void) -{ - struct dlist *subsyslist; - char *class; - - subsyslist = sysfs_open_subsystem_list("class"); - if (!subsyslist) - return -1; - - dlist_for_each_data(subsyslist, class, char) { - struct sysfs_class *cls; - struct dlist *class_devices; - struct sysfs_class_device *class_dev; - struct sysfs_device *phys_dev; - unsigned int major, minor; - - cls = sysfs_open_class(class); - if (!cls) - continue; - - class_devices = sysfs_get_class_devices(cls); - if (!class_devices) - continue; +static void export_name_devpath(struct udevice *udev) { + printf("%s=%s/%s\n", udev->devpath, udev_root, udev->name); +} - dlist_for_each_data(class_devices, class_dev, struct sysfs_class_device) { - struct sysfs_attribute *attr; +static void export_record(struct udevice *udev) { + print_record(udev); + printf("\n"); +} - printf("\n"); - printf("DEVPATH '%s'\n", class_dev->path); - printf("SUBSYSTEM '%s'\n", class_dev->classname); - - attr = sysfs_get_classdev_attr(class_dev, "dev"); - if (attr) { - sscanf(attr->value, "%u:%u", &major, &minor); - printf("MAJOR %u\n", minor); - printf("MINOR %u\n", major); - } +static void export_db(void fnct(struct udevice *udev)) { + LIST_HEAD(name_list); + struct name_entry *name_loop; - phys_dev = sysfs_get_classdev_device(class_dev); - if (phys_dev) { - printf("PHYSDEVPATH '%s'\n", phys_dev->path); - if (phys_dev->bus[0] != '\0') - printf("PHYSDEVBUS '%s'\n", phys_dev->bus); + udev_db_get_all_entries(&name_list); + list_for_each_entry(name_loop, &name_list, node) { + struct udevice udev_db; - if (phys_dev->driver_name[0] != '\0') - printf("PHYSDEVDRIVER '%s'\n", phys_dev->driver_name); - } - } - sysfs_close_class(cls); + udev_init_device(&udev_db, NULL, NULL, NULL); + if (udev_db_get_device(&udev_db, name_loop->name) == 0) + fnct(&udev_db); + udev_cleanup_device(&udev_db); } - sysfs_close_list(subsyslist); + name_list_cleanup(&name_list); +} - return 0; +static void print_help(void) +{ + fprintf(stderr, "Usage: udevinfo [-anpqrVh]\n" + " -q 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" + " -p PATH sysfs device path used for query or chain\n" + " -n NAME node/symlink name used for query\n" + "\n" + " -r prepend to query result or print udev_root\n" + " -a print all SYSFS_attributes along the device chain\n" + " -e export the content of the udev database\n" + " -V print udev version\n" + " -h print this help text\n" + "\n"); } -static int process_options(int argc, char *argv[]) +int main(int argc, char *argv[], char *envp[]) { - static const char short_options[] = "adn:p:q:rsVh"; + static const char short_options[] = "aden:p:q:rVh"; int option; - int retval = 1; struct udevice udev; int root = 0; - int attributes = 0; - enum query_type query = NONE; - char result[1024] = ""; - char path[NAME_SIZE] = ""; - char name[NAME_SIZE] = ""; - char temp[NAME_SIZE]; + + enum action_type { + ACTION_NONE, + ACTION_QUERY, + ACTION_ATTRIBUTE_WALK, + ACTION_ROOT, + } action = ACTION_NONE; + + enum query_type { + QUERY_NONE, + QUERY_NAME, + QUERY_PATH, + QUERY_SYMLINK, + QUERY_ENV, + QUERY_ALL, + } query = QUERY_NONE; + + char path[PATH_SIZE] = ""; + char name[PATH_SIZE] = ""; + char temp[PATH_SIZE]; + struct name_entry *name_loop; char *pos; + int retval = 0; + + logging_init("udevinfo"); + + udev_init_config(); + udev_init_device(&udev, NULL, NULL, NULL); /* get command line options */ while (1) { @@ -275,66 +257,67 @@ static int process_options(int argc, char *argv[]) switch (option) { case 'n': dbg("udev name: %s\n", optarg); - strfieldcpy(name, optarg); + strlcpy(name, optarg, sizeof(name)); break; - case 'p': dbg("udev path: %s\n", optarg); - strfieldcpy(path, optarg); + strlcpy(path, optarg, sizeof(path)); break; - case 'q': dbg("udev query: %s\n", optarg); - + action = ACTION_QUERY; if (strcmp(optarg, "name") == 0) { - query = NAME; + query = QUERY_NAME; break; } - if (strcmp(optarg, "symlink") == 0) { - query = SYMLINK; + query = QUERY_SYMLINK; break; } - if (strcmp(optarg, "path") == 0) { - query = PATH; + query = QUERY_PATH; + break; + } + if (strcmp(optarg, "env") == 0) { + query = QUERY_ENV; break; } - if (strcmp(optarg, "all") == 0) { - query = ALL; + query = QUERY_ALL; break; } - - printf("unknown query type\n"); - exit(1); - + fprintf(stderr, "unknown query type\n"); + retval = 2; + goto exit; case 'r': + if (action == ACTION_NONE) + action = ACTION_ROOT; root = 1; break; - - case 's': - print_sysfs_devices(); - exit(0); - case 'a': - attributes = 1; + action = ACTION_ATTRIBUTE_WALK; break; - + case 'd': + export_db(export_name_devpath); + goto exit; + case 'e': + export_db(export_record); + goto exit; case 'V': printf("udevinfo, version %s\n", UDEV_VERSION); - exit(0); - + goto exit; case 'h': - retval = 0; case '?': default: - goto help; + print_help(); + goto exit; } } - /* process options */ - if (query != NONE) { + /* run action */ + switch (action) { + case ACTION_QUERY: + /* need devpath or node/symlink name for query */ if (path[0] != '\0') { /* remove sysfs_path if given */ if (strncmp(path, sysfs_path, strlen(sysfs_path)) == 0) { @@ -342,143 +325,102 @@ static int process_options(int argc, char *argv[]) } else { if (path[0] != '/') { /* prepend '/' if missing */ - strfieldcat(temp, "/"); - strfieldcat(temp, path); + strcpy(temp, "/"); + strlcpy(temp, path, sizeof(temp)); pos = temp; } else { pos = path; } } - memset(&udev, 0x00, sizeof(struct udevice)); - strfieldcpy(udev.devpath, pos); - retval = udev_db_get_device(&udev); + retval = udev_db_get_device(&udev, pos); if (retval != 0) { - printf("device not found in database\n"); + fprintf(stderr, "no record for '%s' in database\n", pos); + retval = 3; goto exit; } - goto print; - } + } else if (name[0] != '\0') { + char devpath[PATH_SIZE]; + int len; - if (name[0] != '\0') { /* remove udev_root if given */ - int len = strlen(udev_root); - + len = strlen(udev_root); if (strncmp(name, udev_root, len) == 0) { pos = &name[len+1]; } else pos = name; - memset(&udev, 0x00, sizeof(struct udevice)); - strfieldcpy(udev.name, pos); - retval = udev_db_get_device_byname(&udev, pos); + retval = udev_db_lookup_name(pos, devpath, sizeof(devpath)); if (retval != 0) { - printf("device not found in database\n"); + fprintf(stderr, "no record for '%s' in database\n", pos); + retval = 3; goto exit; } - - goto print; + udev_db_get_device(&udev, devpath); + } else { + fprintf(stderr, "query needs device path(-p) or node name(-n) specified\n"); + retval = 4; + goto exit; } - printf("query needs device path(-p) or node name(-n) specified\n"); - goto exit; - -print: switch(query) { - case NAME: - if (root) { - snprintf(result, NAME_SIZE-1, "%s/%s", udev_root, udev.name); - result[NAME_SIZE-1] = '\0'; - } else { - strfieldcpy(result, udev.name); - } + case QUERY_NAME: + if (root) + printf("%s/%s\n", udev_root, udev.name); + else + printf("%s\n", udev.name); break; - - case SYMLINK: - if (root) { - int slen; - char *spos; - char slink[NAME_SIZE]; - - pos = result; - foreach_strpart(udev.symlink, " \n\r", spos, slen) { - strncpy(slink, spos, slen); - slink[slen] = '\0'; - pos += sprintf(pos, "%s/%s ", udev_root, slink); - } - } else { - strfieldcpy(result, udev.symlink); - } + 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"); break; - - case PATH: - strfieldcpy(result, path); + case QUERY_PATH: + printf("%s\n", udev.devpath); + goto exit; + case QUERY_ENV: + list_for_each_entry(name_loop, &udev.env_list, node) + printf("%s\n", name_loop->name); break; - - case ALL: + case QUERY_ALL: print_record(&udev); - goto exit; - + break; default: - goto exit; + print_help(); + break; } - printf("%s\n", result); - -exit: - return retval; - } - - if (attributes) { + break; + case ACTION_ATTRIBUTE_WALK: if (path[0] == '\0') { - printf("attribute walk on device chain needs path(-p) specified\n"); - return -EINVAL; + fprintf(stderr, "attribute walk on device chain needs path(-p) specified\n"); + retval = 4; + goto exit; } else { if (strncmp(path, sysfs_path, strlen(sysfs_path)) != 0) { /* prepend sysfs mountpoint if not given */ - strfieldcpy(temp, path); - strfieldcpy(path, sysfs_path); - strfieldcat(path, temp); + snprintf(temp, sizeof(temp), "%s%s", sysfs_path, path); + temp[sizeof(temp)-1] = '\0'; + strlcpy(path, temp, sizeof(temp)); } print_device_chain(path); - return 0; } - } - - if (root) { + break; + case ACTION_ROOT: printf("%s\n", udev_root); - return 0; + break; + default: + print_help(); + retval = 1; + break; } -help: - printf("Usage: [-anpqrdVh]\n" - " -q TYPE query database for the specified value:\n" - " 'name' name of device node\n" - " 'symlink' pointing to node\n" - " 'path' sysfs device path\n" - " 'all' all values\n" - "\n" - " -p PATH sysfs device path used for query or chain\n" - " -n NAME node/symlink name used for query\n" - "\n" - " -r print udev root\n" - " -a print all SYSFS_attributes along the device chain\n" - " -s print all sysfs devices with major/minor, physical device and bus\n" - " -V print udev version\n" - " -h print this help text\n" - "\n"); - return retval; -} - -int main(int argc, char *argv[], char *envp[]) -{ - int rc = 0; - - logging_init("udevinfo"); - - /* initialize our configuration */ - udev_init_config(); - - rc = process_options(argc, argv); - +exit: + udev_cleanup_device(&udev); logging_close(); - exit(rc); + return retval; }