X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=00af081eacfc1fccde721cb711aef27e3c6011c0;hp=f1b74fc8f6c98899b08eb5ab1e4887cbd1b9c7ba;hb=eb8700908c961d4a0197273f728bc3a3d6cd6c4a;hpb=f156b6d2037ff09f7218e11d5326c05488356ea1 diff --git a/udevinfo.c b/udevinfo.c index f1b74fc8f..00af081ea 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; @@ -58,7 +54,7 @@ static int print_all_attributes(const char *path) 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; @@ -128,10 +124,6 @@ static int print_device_chain(const char *path) struct sysfs_device *sysfs_dev; struct sysfs_device *sysfs_dev_parent; 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,16 +139,10 @@ 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); @@ -197,21 +183,22 @@ exit: return retval; } -/* print all class/block devices with major/minor, physical device and bus*/ -static void print_sysfs_devices(void) +/* 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) - exit(1); + 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) @@ -227,44 +214,41 @@ static void print_sysfs_devices(void) 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); + sscanf(attr->value, "%u:%u", &major, &minor); + printf("MAJOR %u\n", minor); + printf("MINOR %u\n", major); } 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); + printf("PHYSDEVBUS '%s'\n", phys_dev->bus); + if (phys_dev->driver_name[0] != '\0') - printf("DRIVER '%s'\n", phys_dev->driver_name); + printf("PHYSDEVDRIVER '%s'\n", phys_dev->driver_name); } } - sysfs_close_class(cls); } - sysfs_close_list(subsyslist); + + 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[] = "an:p:q:rsVh"; 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 +256,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; @@ -356,7 +340,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(&udev); if (retval != 0) { printf("device not found in database\n"); goto exit; @@ -375,7 +359,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_byname(&udev, pos); if (retval != 0) { printf("device not found in database\n"); goto exit; @@ -399,11 +383,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 +438,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" @@ -464,15 +461,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);