bleah, more merge fixes...

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index 11482727436d31a9e78432ac531c4e4cd48bd5b5..116aedbc21ea06258c60a6a559990b547ad0ef47 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -30,10 +30,10 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "libsysfs/dlist.h"
 #include "udev.h"
 #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_version.h"

+#include "udev_db.h"

 #include "logging.h"
 #include "logging.h"

-#include "udevdb.h"

 
 
 #define SYSFS_VALUE_SIZE               256
 
 
 #define SYSFS_VALUE_SIZE               256


@@ -125,10 +125,6 @@ static int print_device_chain(const char *path)
        struct sysfs_device *sysfs_dev;
        struct sysfs_device *sysfs_dev_parent;
        int retval = 0;
        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);
 
        /*  get the class dev */
        class_dev = sysfs_open_class_device_path(path);


@@ -144,16 +140,10 @@ static int print_device_chain(const char *path)
               "to match the device for which the node will be created.\n"
               "\n");
 
               "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);
                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);
 
        /* open sysfs class device directory and print all attributes */
        printf("  looking at class device '%s':\n", class_dev->path);


@@ -209,7 +199,7 @@ static int print_sysfs_devices(void)
                struct dlist *class_devices;
                struct sysfs_class_device *class_dev;
                struct sysfs_device *phys_dev;
                struct dlist *class_devices;
                struct sysfs_class_device *class_dev;
                struct sysfs_device *phys_dev;

-               struct sysfs_driver *driver;
+               unsigned int major, minor;

 
                cls = sysfs_open_class(class);
                if (!cls)
 
                cls = sysfs_open_class(class);
                if (!cls)


@@ -228,23 +218,19 @@ static int print_sysfs_devices(void)
 
                        attr = sysfs_get_classdev_attr(class_dev, "dev");
                        if (attr) {
 
                        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("DEVMAJORMINOR  '%s'\n", attr->value);
+                               sscanf(attr->value, "%u:%u", &major, &minor);
+                               printf("MAJOR          %u\n", minor);
+                               printf("MINOR          %u\n", major);

                        }
 
                        }
 

-                       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("PHYSDEVBUS     '%s'\n", phys_dev->bus);
                        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_class(cls);


@@ -256,7 +242,7 @@ static int print_sysfs_devices(void)
 
 static int process_options(int argc, char *argv[])
 {
 
 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 option;
        int retval = 1;
        struct udevice udev;


@@ -355,7 +341,7 @@ static int process_options(int argc, char *argv[])
                        }
                        memset(&udev, 0x00, sizeof(struct udevice));
                        strfieldcpy(udev.devpath, pos);
                        }
                        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;
                        if (retval != 0) {
                                printf("device not found in database\n");
                                goto exit;


@@ -374,7 +360,7 @@ static int process_options(int argc, char *argv[])
 
                        memset(&udev, 0x00, sizeof(struct udevice));
                        strfieldcpy(udev.name, pos);
 
                        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;
                        if (retval != 0) {
                                printf("device not found in database\n");
                                goto exit;


@@ -415,7 +401,7 @@ print:
                        break;
 
                case PATH:
                        break;
 
                case PATH:

-                       strfieldcpy(result, path);
+                       strfieldcpy(result, udev.devpath);

                        break;
 
                case ALL:
                        break;
 
                case ALL:


@@ -453,7 +439,7 @@ exit:
        }
 
 help:
        }
 
 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"
               "  -q TYPE  query database for the specified value:\n"
               "             'name'    name of device node\n"
               "             'symlink' pointing to node\n"