[PATCH] rename namedev's get_attr() to be main namedev_name_device() as that's what...

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index e640b93c3dc94ec29b0a284be38796020b60ae22..deb1d929e0fe38927ce0960422adf3305f3dc876 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -124,6 +124,8 @@ static int add_dev(struct config_device *new_dev)
                struct config_device *dev = list_entry(tmp, struct config_device, node);
                if (strncmp_wildcard(dev->name, new_dev->name, sizeof(dev->name)))
                        continue;
+               if (strncmp(dev->bus, new_dev->bus, sizeof(dev->name)))
+                       continue;
                copy_var(dev, new_dev, type);
                copy_var(dev, new_dev, mode);
                copy_string(dev, new_dev, bus);
@@ -132,6 +134,7 @@ static int add_dev(struct config_device *new_dev)
                copy_string(dev, new_dev, id);
                copy_string(dev, new_dev, place);
                copy_string(dev, new_dev, kernel_name);
+               copy_string(dev, new_dev, exec_program);
                copy_string(dev, new_dev, owner);
                copy_string(dev, new_dev, group);
                return 0;
@@ -142,7 +145,7 @@ static int add_dev(struct config_device *new_dev)
        if (!tmp_dev)
                return -ENOMEM;
        memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
-       list_add(&tmp_dev->node, &config_device_list);
+       list_add_tail(&tmp_dev->node, &config_device_list);
        //dump_dev(tmp_dev);
        return 0;
 }
@@ -216,10 +219,10 @@ static int namedev_init_config(void)
        int retval = 0;
        struct config_device dev;
 
-       dbg("opening %s to read as config", udev_config_filename);
+       dbg("opening '%s' to read as config", udev_config_filename);
        fd = fopen(udev_config_filename, "r");
        if (fd == NULL) {
-               dbg("can't open %s", udev_config_filename);
+               dbg("can't open '%s'", udev_config_filename);
                return -ENODEV;
        }
 
@@ -232,7 +235,7 @@ static int namedev_init_config(void)
                        goto exit;
                lineno++;
 
-               dbg_parse("read %s", temp);
+               dbg_parse("read '%s'", temp);
 
                /* eat the whitespace at the beginning of the line */
                while (isspace(*temp))
@@ -413,10 +416,10 @@ static int namedev_init_permissions(void)
        int retval = 0;
        struct config_device dev;
 
-       dbg("opening %s to read as permissions config", udev_config_permission_filename);
+       dbg("opening '%s' to read as permissions config", udev_config_permission_filename);
        fd = fopen(udev_config_permission_filename, "r");
        if (fd == NULL) {
-               dbg("can't open %s", udev_config_permission_filename);
+               dbg("can't open '%s'", udev_config_permission_filename);
                return -ENODEV;
        }
 
@@ -426,7 +429,7 @@ static int namedev_init_permissions(void)
                if (temp == NULL)
                        break;
 
-               dbg_parse("read %s", temp);
+               dbg_parse("read '%s'", temp);
 
                /* eat the whitespace at the beginning of the line */
                while (isspace(*temp))
@@ -445,25 +448,29 @@ static int namedev_init_permissions(void)
                /* parse the line */
                temp2 = strsep(&temp, ":");
                if (!temp2) {
-                       dbg("cannot parse line: %s", line);
+                       dbg("cannot parse line '%s'", line);
                        continue;
                }
                strncpy(dev.name, temp2, sizeof(dev.name));
 
                temp2 = strsep(&temp, ":");
                if (!temp2) {
-                       dbg("cannot parse line: %s", line);
+                       dbg("cannot parse line '%s'", line);
                        continue;
                }
                strncpy(dev.owner, temp2, sizeof(dev.owner));
 
                temp2 = strsep(&temp, ":");
                if (!temp2) {
-                       dbg("cannot parse line: %s", line);
+                       dbg("cannot parse line '%s'", line);
                        continue;
                }
                strncpy(dev.group, temp2, sizeof(dev.owner));
 
+               if (!temp) {
+                       dbg("cannot parse line: %s", line);
+                       continue;
+               }
                dev.mode = strtol(temp, NULL, 8);
 
                dbg_parse("name='%s', owner='%s', group='%s', mode=%#o",
@@ -496,7 +503,7 @@ static void build_kernel_number(struct sysfs_class_device *class_dev, struct ude
        while (isdigit(*(dig-1)))
                dig--;
        strfieldcpy(udev->kernel_number, dig);
-       dbg("kernel_number = %s", udev->kernel_number);
+       dbg("kernel_number='%s'", udev->kernel_number);
 }
 
 static void apply_format(struct udevice *udev, unsigned char *string)
@@ -514,7 +521,7 @@ static void apply_format(struct udevice *udev, unsigned char *string)
                        case 'b':
                                if (strlen(udev->bus_id) == 0)
                                        break;
-                               strcat(string, udev->bus_id);
+                               strcat(pos, udev->bus_id);
                                dbg("substitute bus_id '%s'", udev->bus_id);
                                break;
                        case 'n':
@@ -523,6 +530,15 @@ static void apply_format(struct udevice *udev, unsigned char *string)
                                strcat(pos, udev->kernel_number);
                                dbg("substitute kernel number '%s'", udev->kernel_number);
                                break;
+                       case 'D':
+                               if (strlen(udev->kernel_number) == 0) {
+                                       strcat(pos, "disk");
+                                       break;
+                               }
+                               strcat(pos, "part");
+                               strcat(pos, udev->kernel_number);
+                               dbg("substitute kernel number '%s'", udev->kernel_number);
+                               break;
                        case 'm':
                                sprintf(pos, "%u", udev->minor);
                                dbg("substitute minor number '%u'", udev->minor);
@@ -608,7 +624,7 @@ static int exec_callout(struct config_device *dev, char *value, int len)
                                break;
                        buffer[res] = '\0';
                        if (res > len) {
-                               dbg("callout len %d too short\n", len);
+                               dbg("callout len %d too short", len);
                                retval = -1;
                        }
                        if (value_set) {
@@ -637,7 +653,7 @@ static int exec_callout(struct config_device *dev, char *value, int len)
        return retval;
 }
 
-static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev)
+static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
        struct config_device *dev;
        struct list_head *tmp;
@@ -647,6 +663,12 @@ static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev
                if (dev->type != CALLOUT)
                        continue;
 
+               if (sysfs_device) {
+                       dbg_parse("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+                       if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
+                               continue;
+               }
+
                /* substitute anything that needs to be in the program name */
                apply_format(udev, dev->exec_program);
                if (exec_callout(dev, udev->callout_value, NAME_SIZE))
@@ -660,7 +682,7 @@ static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev
                        strfieldcpy(udev->group, dev->group);
                }
                dbg_parse("callout returned matching value '%s', '%s' becomes '%s'"
-                         " - owner='%s', group='%s', mode =%#o",
+                         " - owner='%s', group='%s', mode=%#o",
                          dev->id, class_dev->name, udev->name,
                          dev->owner, dev->group, dev->mode);
                return 0;
@@ -679,6 +701,12 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
                if (dev->type != LABEL)
                        continue;
 
+               if (sysfs_device) {
+                       dbg_parse("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+                       if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
+                               continue;
+               }
+
                dbg_parse("look for device attribute '%s'", dev->sysfs_file);
                /* try to find the attribute in the class device directory */
                tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
@@ -734,6 +762,10 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
                if (dev->type != NUMBER)
                        continue;
 
+               dbg_parse("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+               if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
+                       continue;
+
                found = 0;
                strfieldcpy(path, sysfs_device->path);
                temp = strrchr(path, '/');
@@ -764,7 +796,6 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
        return -ENODEV;
 }
 
-
 static int do_topology(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
        struct config_device *dev;
@@ -782,6 +813,10 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
                if (dev->type != TOPOLOGY)
                        continue;
 
+               dbg_parse("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+               if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
+                       continue;
+
                found = 0;
                strfieldcpy(path, sysfs_device->path);
                temp = strrchr(path, '/');
@@ -813,7 +848,7 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
        return -ENODEV;
 }
 
-static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev)
+static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
        struct config_device *dev;
        struct list_head *tmp;
@@ -824,8 +859,8 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
                        continue;
 
                dbg_parse("compare name '%s' with '%s'",
-                         dev->kernel_name, dev->name);
-               if (strcmp(dev->kernel_name, class_dev->name) != 0)
+                         dev->kernel_name, class_dev->name);
+               if (strncmp_wildcard(class_dev->name, dev->kernel_name, NAME_SIZE) != 0)
                        continue;
 
                strfieldcpy(udev->name, dev->name);
@@ -865,7 +900,7 @@ static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *
        }
 }
 
-static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
+int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
        struct sysfs_device *sysfs_device = NULL;
        struct sysfs_class_device *class_dev_parent = NULL;
@@ -884,11 +919,11 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
                 * up in the kernel...
                 */
                if (strstr(class_dev->path, "block")) {
-                       dbg_parse("looking at block device...");
+                       dbg_parse("looking at block device");
                        if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
                                char path[SYSFS_PATH_MAX];
 
-                               dbg_parse("really is a partition...");
+                               dbg_parse("really is a partition");
                                strfieldcpy(path, class_dev->path);
                                temp = strrchr(path, '/');
                                *temp = 0x00;
@@ -897,7 +932,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
                                if (class_dev_parent == NULL) {
                                        dbg("sysfs_open_class_device at '%s' failed", path);
                                } else {
-                                       dbg_parse("class_dev_parent->name=%s", class_dev_parent->name);
+                                       dbg_parse("class_dev_parent->name='%s'", class_dev_parent->name);
                                        if (class_dev_parent->sysdevice)
                                                sysfs_device = class_dev_parent->sysdevice;
                                }
@@ -908,6 +943,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
        if (sysfs_device) {
                dbg_parse("sysfs_device->path='%s'", sysfs_device->path);
                dbg_parse("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
+               dbg_parse("sysfs_device->bus='%s'", sysfs_device->bus);
                strfieldcpy(udev->bus_id, sysfs_device->bus_id);
        } else {
                dbg_parse("class_dev->name = '%s'", class_dev->name);
@@ -916,7 +952,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
        build_kernel_number(class_dev, udev);
 
        /* rules are looked at in priority order */
-       retval = do_callout(class_dev, udev);
+       retval = do_callout(class_dev, udev, sysfs_device);
        if (retval == 0)
                goto found;
 
@@ -932,7 +968,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
        if (retval == 0)
                goto found;
 
-       retval = do_replace(class_dev, udev);
+       retval = do_replace(class_dev, udev, sysfs_device);
        if (retval == 0)
                goto found;
 
@@ -957,17 +993,6 @@ done:
        return 0;
 }
 
-int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev)
-{
-       int retval;
-
-       retval = get_attr(class_dev, dev);
-       if (retval)
-               dbg("get_attr failed");
-
-       return retval;
-}
-
 int namedev_init(void)
 {
        int retval;