chiark / gitweb /
[PATCH] use numeric owner/group as default values to avoid parsing userdb
[elogind.git] / udevinfo.c
index a80ca82..b2d22e9 100644 (file)
@@ -49,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_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);
@@ -92,19 +79,17 @@ 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)
 {
+       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");
+       list_for_each_entry(name_loop, &udev->symlink_list, node)
+               printf("S: %s\n", name_loop->name);
+
        return 0;
 }
 
@@ -113,7 +98,7 @@ enum query_type {
        NAME,
        PATH,
        SYMLINK,
-       ALL
+       ALL,
 };
 
 static int print_device_chain(const char *path)
@@ -123,6 +108,7 @@ 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;
 
        /*  get the class dev */
@@ -146,11 +132,15 @@ static int print_device_chain(const char *path)
 
        /* 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);
@@ -164,12 +154,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)
@@ -183,76 +181,30 @@ 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;
-
-               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);
-
-                       attr = sysfs_get_classdev_attr(class_dev, "dev");
-                       if (attr) {
-                               sscanf(attr->value, "%u:%u", &major, &minor);
-                               printf("MAJOR          %u\n", major);
-                               printf("MINOR          %u\n", minor);
-                       }
-
-                       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);
-
-                               if (phys_dev->driver_name[0] != '\0')
-                                       printf("PHYSDEVDRIVER  '%s'\n", phys_dev->driver_name);
-                       }
-               }
-               sysfs_close_class(cls);
-       }
-       sysfs_close_list(subsyslist);
-
+static int print_dump(const char *devpath, const char *name) {
+       printf("%s:%s/%s\n", devpath, udev_root, name);
        return 0;
 }
 
-static int process_options(int argc, char *argv[])
+int main(int argc, char *argv[], char *envp[])
 {
-       static const char short_options[] = "an: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[1024] = "";
        char path[NAME_SIZE] = "";
        char name[NAME_SIZE] = "";
        char temp[NAME_SIZE];
+       struct name_entry *name_loop;
        char *pos;
+       int retval = 0;
+
+       logging_init("udevinfo");
+
+       udev_init_config();
+       udev_init_device(&udev, NULL, NULL);
 
        /* get command line options */
        while (1) {
@@ -296,26 +248,27 @@ static int process_options(int argc, char *argv[])
                        }
 
                        printf("unknown query type\n");
-                       exit(1);
+                       retval = 1;
+                       goto exit;
 
                case 'r':
                        root = 1;
                        break;
 
-               case 's':
-                       print_sysfs_devices();
-                       exit(0);
-
                case 'a':
                        attributes = 1;
                        break;
 
+               case 'd':
+                       udev_db_dump_names(print_dump);
+                       goto exit;
+
                case 'V':
                        printf("udevinfo, version %s\n", UDEV_VERSION);
-                       exit(0);
+                       goto exit;
 
                case 'h':
-                       retval = 0;
+                       retval = 2;
                case '?':
                default:
                        goto help;
@@ -331,16 +284,14 @@ static int process_options(int argc, char *argv[])
                        } else {
                                if (path[0] != '/') {
                                        /* prepend '/' if missing */
-                                       strfieldcat(temp, "/");
+                                       strcpy(temp, "/");
                                        strfieldcat(temp, path);
                                        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");
                                goto exit;
@@ -349,77 +300,64 @@ static int process_options(int argc, char *argv[])
                }
 
                if (name[0] != '\0') {
-                       /* remove udev_root if given */
-                       int len = strlen(udev_root);
+                       char devpath[NAME_SIZE];
+                       int len;
 
+                       /* remove udev_root if given */
+                       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_search_name(devpath, DEVPATH_SIZE, pos);
                        if (retval != 0) {
                                printf("device not found in database\n");
                                goto exit;
                        }
-
+                       udev_db_get_device(&udev, devpath);
                        goto print;
                }
 
                printf("query needs device path(-p) or node name(-n) specified\n");
+               retval = 3;
                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);
-                       }
-                       break;
-
+                       if (root)
+                               printf("%s/%s\n", udev_root, udev.name);
+                       else
+                               printf("%s\n", udev.name);
+                       goto exit;
                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);
-                       }
-                       break;
-
+                       if (list_empty(&udev.symlink_list))
+                               break;
+                       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");
+                       goto exit;
                case PATH:
-                       strfieldcpy(result, udev.devpath);
-                       break;
-
+                       printf("%s\n", udev.devpath);
+                       goto exit;
                case ALL:
                        print_record(&udev);
                        goto exit;
-
                default:
-                       goto exit;
+                       goto help;
                }
-               printf("%s\n", result);
-
-exit:
-               return retval;
        }
 
        if (attributes) {
                if (path[0] == '\0') {
                        printf("attribute walk on device chain needs path(-p) specified\n");
-                       return -EINVAL;
+                       retval = 4;
+                       goto exit;
                } else {
                        if (strncmp(path, sysfs_path, strlen(sysfs_path)) != 0) {
                                /* prepend sysfs mountpoint if not given */
@@ -428,13 +366,13 @@ exit:
                                strfieldcat(path, temp);
                        }
                        print_device_chain(path);
-                       return 0;
+                       goto exit;
                }
        }
 
        if (root) {
                printf("%s\n", udev_root);
-               return 0;
+               goto exit;
        }
 
 help:
@@ -450,24 +388,14 @@ 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");
-       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;
 }