[PATCH] Clean up the namedev interface a bit, making the code smaller...

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 0271ba55a2ad4091f382c506c87a559aa456dd57..b6d9a7f8e20085f374df36a6ba554df034d4639e 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -34,6 +34,7 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "namedev.h"
+#include "libsysfs/libsysfs.h"
 
 #define TYPE_LABEL     "LABEL"
 #define TYPE_NUMBER    "NUMBER"
@@ -53,9 +54,6 @@ enum config_type {
 #define VALUE_SIZE     100
 #define ID_SIZE                50
 #define PLACE_SIZE     50
-#define NAME_SIZE      100
-#define OWNER_SIZE     30
-#define GROUP_SIZE     30
 
 
 struct config_device {
@@ -85,31 +83,31 @@ static void dump_dev(struct config_device *dev)
        switch (dev->type) {
        case KERNEL_NAME:
                dbg("KERNEL name ='%s'"
-                       " owner = '%s', group = '%s', mode = '%d'", 
+                       " owner = '%s', group = '%s', mode = '%#o'",
                        dev->name, 
                        dev->owner, dev->group, dev->mode);
                break;
        case LABEL:
                dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
-                       " owner = '%s', group = '%s', mode = '%d'",
+                       " owner = '%s', group = '%s', mode = '%#o'",
                        dev->name, dev->bus, dev->sysfs_file, dev->sysfs_value,
                        dev->owner, dev->group, dev->mode);
                break;
        case NUMBER:
                dbg("NUMBER name = '%s', bus = '%s', id = '%s'"
-                       " owner = '%s', group = '%s', mode = '%d'",
+                       " owner = '%s', group = '%s', mode = '%#o'",
                        dev->name, dev->bus, dev->id,
                        dev->owner, dev->group, dev->mode);
                break;
        case TOPOLOGY:
                dbg("TOPOLOGY name = '%s', bus = '%s', place = '%s'"
-                       " owner = '%s', group = '%s', mode = '%d'",
+                       " owner = '%s', group = '%s', mode = '%#o'",
                        dev->name, dev->bus, dev->place,
                        dev->owner, dev->group, dev->mode);
                break;
        case REPLACE:
                dbg("REPLACE name = %s, kernel_name = %s"
-                       " owner = '%s', group = '%s', mode = '%d'",
+                       " owner = '%s', group = '%s', mode = '%#o'",
                        dev->name, dev->kernel_name,
                        dev->owner, dev->group, dev->mode);
                break;
@@ -432,7 +430,7 @@ static int namedev_init_permissions(void)
 
                dev.mode = strtol(temp, NULL, 8);
 
-               dbg("name = %s, owner = %s, group = %s, mode = %x", dev.name, dev.owner, dev.group, dev.mode);
+               dbg("name = %s, owner = %s, group = %s, mode = %#o", dev.name, dev.owner, dev.group, dev.mode);
                retval = add_dev(&dev);
                if (retval) {
                        dbg("add_dev returned with error %d", retval);
@@ -445,12 +443,53 @@ exit:
        return retval;
 }      
 
+static int get_default_mode(struct sysfs_class_device *class_dev)
+{
+       /* just default everyone to rw for the world! */
+       return 0666;
+}
 
 
-int namedev_init(void)
+static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *attr)
+{
+       struct list_head *tmp;
+       int retval = 0;
+
+       list_for_each(tmp, &config_device_list) {
+               struct config_device *dev = list_entry(tmp, struct config_device, node);
+               if (strcmp(dev->name, class_dev->name) == 0) {
+                       attr->mode = dev->mode;
+                       strcpy(attr->owner, dev->owner);
+                       strcpy(attr->group, dev->group);
+                       /* FIXME  put the proper name here!!! */
+                       strcpy(attr->name, dev->name);
+                       dbg("%s - owner = %s, group = %s, mode = %#o", dev->name, dev->owner, dev->group, dev->mode);
+                       goto exit;
+               }
+       }
+       attr->mode = get_default_mode(class_dev);
+       attr->owner[0] = 0x00;
+       attr->group[0] = 0x00;
+       strcpy(attr->name, class_dev->name);
+exit:
+       return retval;
+}
+
+int namedev_name_device(struct sysfs_class_device *class_dev, struct device_attr *attr)
 {
        int retval;
 
+       retval = get_attr(class_dev, attr);
+       if (retval)
+               dbg("get_attr failed");
+
+       return retval;
+}
+
+int namedev_init(void)
+{
+       int retval;
+       
        retval = namedev_init_config();
        if (retval)
                return retval;
@@ -463,3 +502,4 @@ int namedev_init(void)
        return retval;
 }
 
+