[PATCH] make the udev object available to more processing stages

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index f1b74fc8f6c98899b08eb5ab1e4887cbd1b9c7ba..11482727436d31a9e78432ac531c4e4cd48bd5b5 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -36,10 +36,7 @@
 #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];
@@ -58,7 +55,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;
 
@@ -197,21 +194,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;
+               struct sysfs_driver *driver;
 
                cls = sysfs_open_class(class);
                if (!cls)
@@ -227,7 +225,6 @@ 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) {
@@ -236,26 +233,28 @@ static void print_sysfs_devices(void)
                                if  (pos[0] == '\n')
                                        pos[0] = '\0';
 
-                               printf("MAJORMINOR     '%s'\n", attr->value);
+                               printf("DEVMAJORMINOR  '%s'\n", attr->value);
                        }
 
+                       driver = sysfs_get_classdev_driver(class_dev);
+                       if (driver)
+                               printf("DEVDRIVER      '%s'\n", driver->name);
+
                        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);
+                                       printf("PHYSDEVBUS     '%s'\n", phys_dev->bus);
                        }
                }
-
                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";
        int option;
@@ -264,7 +263,7 @@ static int process_options(void)
        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 +271,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;
 
@@ -399,7 +398,20 @@ 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:
@@ -464,15 +476,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);