X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevinfo.c;h=045395256d2b75d2b254ef562299872fbaf9faa2;hb=4e05e4238b2cb63eb3f3cd51cf76f136fa684f2e;hp=f1b74fc8f6c98899b08eb5ab1e4887cbd1b9c7ba;hpb=f156b6d2037ff09f7218e11d5326c05488356ea1;p=elogind.git diff --git a/udevinfo.c b/udevinfo.c index f1b74fc8f..045395256 100644 --- a/udevinfo.c +++ b/udevinfo.c @@ -30,19 +30,15 @@ #include "libsysfs/sysfs/libsysfs.h" #include "libsysfs/dlist.h" #include "udev.h" -#include "udev_lib.h" +#include "udev_utils.h" #include "udev_version.h" +#include "udev_db.h" #include "logging.h" -#include "udevdb.h" -# define SYSFS_VALUE_MAX 200 - -char **main_argv; -int main_argc; +#define SYSFS_VALUE_SIZE 256 #ifdef LOG -unsigned char logname[LOGNAME_SIZE]; void log_message (int level, const char *format, ...) { va_list args; @@ -53,26 +49,13 @@ void log_message (int level, const char *format, ...) } #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_MAX]; + 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; - } - - dlist_for_each_data(attributes, attr, struct sysfs_attribute) { + dlist_for_each_data(attr_list, attr, struct sysfs_attribute) { if (attr->value != NULL) { strfieldcpy(value, attr->value); len = strlen(value); @@ -96,11 +79,6 @@ static int print_all_attributes(const char *path) } } printf("\n"); - -exit: - sysfs_close_directory(sysfs_dir); - - return retval; } static int print_record(struct udevice *udev) @@ -127,11 +105,8 @@ static int print_device_chain(const char *path) 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); @@ -147,24 +122,22 @@ 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(" SUBSYSTEM=\"%s\"\n", class_dev->classname); + + attr_list = sysfs_get_classdev_attributes(class_dev); + if (attr_list == NULL) { printf("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); @@ -178,12 +151,20 @@ static int print_device_chain(const char *path) /* look the device chain upwards */ while (sysfs_dev != NULL) { + attr_list = sysfs_get_device_attributes(sysfs_dev); + if (attr_list == NULL) { + printf("couldn't open device directory\n"); + retval = -1; + goto exit; + } + 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); + printf(" DRIVER=\"%s\"\n", sysfs_dev->driver_name); /* open sysfs device directory and print all attributes */ - print_all_attributes(sysfs_dev->path); + print_all_attributes(attr_list); sysfs_dev_parent = sysfs_get_device_parent(sysfs_dev); if (sysfs_dev_parent == NULL) @@ -197,74 +178,21 @@ exit: return retval; } -/* print all class/block devices with major/minor, physical device and bus*/ -static void print_sysfs_devices(void) -{ - struct dlist *subsyslist; - char *class; - - subsyslist = sysfs_open_subsystem_list("class"); - if (!subsyslist) - exit(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; - - cls = sysfs_open_class(class); - if (!cls) - continue; - - class_devices = sysfs_get_class_devices(cls); - if (!class_devices) - continue; - - dlist_for_each_data(class_devices, class_dev, struct sysfs_class_device) { - struct sysfs_attribute *attr; - - printf("\n"); - printf("DEVPATH '%s'\n", class_dev->path); - printf("SUBSYSTEM '%s'\n", class_dev->classname); - printf("NAME '%s'\n", class_dev->name); - - attr = sysfs_get_classdev_attr(class_dev, "dev"); - if (attr) { - char *pos = &(attr->value[strlen(attr->value)-1]); - - if (pos[0] == '\n') - pos[0] = '\0'; - - printf("MAJORMINOR '%s'\n", attr->value); - } - - 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("PHYSDEVPATHBUS '%s'\n", phys_dev->bus); - if (phys_dev->driver_name[0] != '\0') - printf("DRIVER '%s'\n", phys_dev->driver_name); - } - } - - sysfs_close_class(cls); - } - - sysfs_close_list(subsyslist); +static int print_dump(struct udevice *udev) { + printf("%s:%s/%s\n", udev->devpath, udev_root, udev->name); + return 0; } -static int process_options(void) +static int process_options(int argc, char *argv[]) { - static const char short_options[] = "adn:p:q:rsVh"; + static const char short_options[] = "adn:p:q:rVh"; int option; int retval = 1; struct udevice udev; int root = 0; int attributes = 0; enum query_type query = NONE; - char result[NAME_SIZE] = ""; + char result[1024] = ""; char path[NAME_SIZE] = ""; char name[NAME_SIZE] = ""; char temp[NAME_SIZE]; @@ -272,7 +200,7 @@ static int process_options(void) /* get command line options */ while (1) { - option = getopt(main_argc, main_argv, short_options); + option = getopt(argc, argv, short_options); if (option == -1) break; @@ -318,14 +246,14 @@ static int process_options(void) root = 1; break; - case 's': - print_sysfs_devices(); - exit(0); - case 'a': attributes = 1; break; + case 'd': + udev_db_call_foreach(print_dump); + exit(0); + case 'V': printf("udevinfo, version %s\n", UDEV_VERSION); exit(0); @@ -355,8 +283,7 @@ static int process_options(void) } } memset(&udev, 0x00, sizeof(struct udevice)); - strfieldcpy(udev.devpath, pos); - retval = udevdb_get_dev(&udev); + retval = udev_db_get_device_by_devpath(&udev, pos); if (retval != 0) { printf("device not found in database\n"); goto exit; @@ -375,7 +302,7 @@ static int process_options(void) memset(&udev, 0x00, sizeof(struct udevice)); strfieldcpy(udev.name, pos); - retval = udevdb_get_dev_byname(&udev, pos); + retval = udev_db_get_device_by_name(&udev, pos); if (retval != 0) { printf("device not found in database\n"); goto exit; @@ -399,11 +326,24 @@ print: break; case SYMLINK: - strfieldcpy(result, udev.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); + } break; case PATH: - strfieldcpy(result, path); + strfieldcpy(result, udev.devpath); break; case ALL: @@ -441,7 +381,7 @@ exit: } help: - printf("Usage: [-anpqrdVh]\n" + printf("Usage: udevinfo [-anpqrVh]\n" " -q TYPE query database for the specified value:\n" " 'name' name of device node\n" " 'symlink' pointing to node\n" @@ -453,7 +393,8 @@ help: "\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" + " -d print the relationship of devpath and the node name for all\n" + " devices available in the database\n" " -V print udev version\n" " -h print this help text\n" "\n"); @@ -464,15 +405,12 @@ int main(int argc, char *argv[], char *envp[]) { int rc = 0; - main_argv = argv; - main_argc = argc; - logging_init("udevinfo"); /* initialize our configuration */ udev_init_config(); - rc = process_options(); + rc = process_options(argc, argv); logging_close(); exit(rc);