[PATCH] udevdb prototype

[elogind.git] / udev-add.c

diff --git a/udev-add.c b/udev-add.c
index 54af7e4d77bd0494dbbbf671a8495664ae354975..5bd934acd06a29a578fd4b5928fdd7ece1f77e4c 100644 (file)
--- a/udev-add.c
+++ b/udev-add.c
@@ -31,11 +31,10 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "namedev.h"
+#include "udevdb.h"
 #include "libsysfs/libsysfs.h"
 
 
-static char sysfs_path[SYSFS_PATH_MAX];
-
 /* 
  * Right now the major/minor of a device is stored in a file called
  * "dev" in sysfs.
@@ -74,51 +73,47 @@ exit:
  */
 static int create_node(char *name, char type, int major, int minor, int mode)
 {
-       char *argv[7];
-       char mode_string[100];
-       char type_string[3];
-       char major_string[20];
-       char minor_string[20];
        char filename[255];
        int retval = 0;
-
        strncpy(filename, UDEV_ROOT, sizeof(filename));
        strncat(filename, name, sizeof(filename));
-
-       snprintf(mode_string, sizeof(mode_string), "--mode=%#o", mode);
-       snprintf(type_string, sizeof(type_string), "%c", type);
-       snprintf(major_string, sizeof(major_string), "%d", major);
-       snprintf(minor_string, sizeof(minor_string), "%d", minor);
-       
-       argv[0] = MKNOD;
-       argv[1] = mode_string;
-       argv[2] = filename;
-       argv[3] = type_string;
-       argv[4] = major_string;
-       argv[5] = minor_string;
-       argv[6] = NULL;
-       dbg ("executing %s %s %s %s %s %s",
-               argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
-       switch (fork()) {
-               case 0:
-                       /* we are the child, so lets run the program */
-                       execv (MKNOD, argv);
-                       exit(0);
-                       break;
-               case (-1):
-                       dbg ("fork failed.");
-                       retval = -EFAULT;
-                       break;
-               default:
-                       break;
+       switch (type) {
+       case 'b':
+               mode |= S_IFBLK;
+               break;
+       case 'c':
+       case 'u':
+               mode |= S_IFCHR;
+               break;
+       case 'p':
+               mode |= S_IFIFO;
+               break;
+       default:
+               dbg("unknown node type %c\n", type);
+               return -EINVAL;
        }
+
+       retval = mknod(filename,mode,makedev(major,minor));
+       if (retval)
+               dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
+                   filename, mode, major, minor, strerror(errno));
        return retval;
 }
 
 struct sysfs_class_device *get_class_dev(char *device_name)
 {
+       char sysfs_path[SYSFS_PATH_MAX];
        char dev_path[SYSFS_PATH_MAX];
-       struct sysfs_class_device *class_dev;
+       int retval;
+       struct sysfs_class_device *class_dev = NULL;
+
+
+       retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
+       dbg("sysfs_path = %s", sysfs_path);
+       if (retval) {
+               dbg("sysfs_get_mnt_path failed");
+               goto exit;
+       }
 
        strcpy(dev_path, sysfs_path);
        strcat(dev_path, device_name);
@@ -129,46 +124,34 @@ struct sysfs_class_device *get_class_dev(char *device_name)
        class_dev = sysfs_open_class_device(dev_path);
        if (class_dev == NULL) {
                dbg ("sysfs_open_class_device failed");
-               return NULL;
+               goto exit;
        }
        dbg("class_dev->name = %s", class_dev->name);
 
+exit:
        return class_dev;
 }
 
-static int udev_init(void)
-{
-       int retval;
-
-       retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-       dbg("sysfs_path = %s", sysfs_path);
-       return retval;
-}
-
 int udev_add_device(char *device, char *subsystem)
 {
        struct sysfs_class_device *class_dev;
        struct device_attr attr;
-       //char *name;
        int major;
        int minor;
        char type;
-       //int mode;
        int retval = -EINVAL;
 
-       /* sleep for a second or two to give the kernel a chance to
-        * create the dev file
-        */
-       sleep(1);
-
-       udev_init();
-
        /* for now, the block layer is the only place where block devices are */
        if (strcmp(subsystem, "block") == 0)
                type = 'b';
        else
                type = 'c';
 
+       /* sleep for a second or two to give the kernel a chance to
+        * create the dev file
+        */
+       sleep(1);
+
        class_dev = get_class_dev(device);
        if (class_dev == NULL)
                goto exit;
@@ -182,9 +165,31 @@ int udev_add_device(char *device, char *subsystem)
                dbg ("get_major_minor failed");
                goto exit;
        }
+       memset(&dbdev, 0, sizeof(dbdev));
+       strncpy(dbdev.name, attr.name, NAME_SIZE);
+       strncpy(dbdev.sysfs_path, class_dev->sysdevice->directory->path,
+               PATH_SIZE);
+       strncpy(dbdev.class_dev_name, class_dev->name, NAME_SIZE);
+       if ((sysfs_get_name_from_path(subsystem, dbdev.class_name, NAME_SIZE))
+           != 0)
+               strcpy(dbdev.class_name, "unkown");
+       strncpy(dbdev.bus_id, class_dev->sysdevice->bus_id, ID_SIZE);
+       strcpy(dbdev.bus_name, "unknown");
+       if (class_dev->driver != NULL)
+               strncpy(dbdev.driver, class_dev->driver->name, NAME_SIZE);
+       else
+               strcpy(dbdev.driver, "unkown");
+       dbdev.type = type;
+       dbdev.major = major;
+       dbdev.minor = minor;
+       dbdev.mode = attr.mode;
 
        sysfs_close_class_device(class_dev);
 
+       retval = udevdb_add_udevice(&dbdev);
+       if (retval != 0)
+               goto exit;
+
        return create_node(attr.name, type, major, minor, attr.mode);
 
 exit: