chiark / gitweb /
[PATCH] add bus id modifier
[elogind.git] / namedev.c
index 6d88b5d47a263bf56f71266de84d22de6eafadf9..5970ef059053cff1fc6195123bacc753529b145f 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -22,7 +22,7 @@
  */
 
 /* define this to enable parsing debugging */
-#define DEBUG_PARSER
+#define DEBUG_PARSER 
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -537,232 +537,333 @@ static int exec_callout(struct config_device *dev, char *value, int len)
        return retval;
 }
 
-static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
+static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
+       struct config_device *dev;
        struct list_head *tmp;
-       int retval = 0;
-       int found;
+       char value[ID_SIZE];
 
-       udev->mode = 0;
-       if (class_dev->sysdevice) {
-               dbg_parse("class_dev->sysdevice->path = '%s'", class_dev->sysdevice->path);
-               dbg_parse("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
-       } else {
-               dbg_parse("class_dev->name = '%s'", class_dev->name);
+       list_for_each(tmp, &config_device_list) {
+               dev = list_entry(tmp, struct config_device, node);
+               if (dev->type != CALLOUT)
+                       continue;
+
+               if (exec_callout(dev, value, sizeof(value)))
+                       continue;
+               if (strncmp(value, dev->id, sizeof(value)) != 0)
+                       continue;
+               strcpy(udev->name, dev->name);
+               if (dev->mode != 0) {
+                       udev->mode = dev->mode;
+                       strcpy(udev->owner, dev->owner);
+                       strcpy(udev->group, dev->group);
+               }
+               dbg_parse("device callout '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+                       dev->id, udev->name, 
+                       dev->owner, dev->group, dev->mode);
+               return 0;
        }
+       return -ENODEV;
+}
+
+static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+{
+       struct sysfs_attribute *tmpattr = NULL;
+       struct config_device *dev;
+       struct list_head *tmp;
+       char *temp = NULL;
+
        list_for_each(tmp, &config_device_list) {
-               struct config_device *dev = list_entry(tmp, struct config_device, node);
-               switch (dev->type) {
-               case LABEL:
-                       {
-                       struct sysfs_attribute *tmpattr = NULL;
-                       struct sysfs_class_device *class_dev_parent = NULL;
-                       char *temp = NULL;
-
-                       dbg_parse("LABEL: match file '%s' with value '%s'",
-                                       dev->sysfs_file, dev->sysfs_value);
-                       /* try to find the attribute in the class device directory */
-                       tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
+               dev = list_entry(tmp, struct config_device, node);
+               if (dev->type != LABEL)
+                       continue;
+
+               dbg_parse("LABEL: match file '%s' with value '%s'",
+                               dev->sysfs_file, dev->sysfs_value);
+               /* try to find the attribute in the class device directory */
+               tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
+               if (tmpattr)
+                       goto label_found;
+
+               /* look in the class device directory if present */
+               if (sysfs_device) {
+                       tmpattr = sysfs_get_device_attr(sysfs_device, dev->sysfs_file);
                        if (tmpattr)
                                goto label_found;
+               }
 
-                       /* look in the class device directory if present */
-                       if (class_dev->sysdevice) {
-                               tmpattr = sysfs_get_device_attr(class_dev->sysdevice, dev->sysfs_file);
-                               if (tmpattr)
-                                       goto label_found;
-                       }
+               continue;
 
-                       /* bah, let's go backwards up a level to see if the device is there,
-                        * as block partitions don't point to the physical device.  Need to fix that
-                        * up in the kernel...
-                        */
-                       if (strstr(class_dev->path, "block")) {
-                               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...");
-                                       strcpy(path, class_dev->path);
-                                       temp = strrchr(path, '/');
-                                       *temp = 0x00;
-                                       dbg_parse("looking for a class device at '%s'", path);
-                                       class_dev_parent = sysfs_open_class_device(path);
-                                       if (class_dev_parent == NULL) {
-                                               dbg("sysfs_open_class_device at '%s' failed", path);
-                                               continue;
-                                       }
-                                       dbg_parse("class_dev_parent->name = %s", class_dev_parent->name);
+label_found:
+               tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
+               dbg_parse("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, tmpattr->value, dev->sysfs_value);
+               if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
+                       continue;
 
-                                       /* try to find the attribute in the class device directory */
-                                       tmpattr = sysfs_get_classdev_attr(class_dev_parent, dev->sysfs_file);
-                                       if (tmpattr) 
-                                               goto label_found;
-
-                                       /* look in the class device directory if present */
-                                       if (class_dev_parent->sysdevice) {
-                                               tmpattr = sysfs_get_device_attr(class_dev_parent->sysdevice, dev->sysfs_file);
-                                               if (tmpattr) 
-                                                       goto label_found;
-                                       }
-                                       
-                               }
-                       }
-                       if (class_dev_parent)
-                               sysfs_close_class_device(class_dev_parent);
+               strcpy(udev->name, dev->name);
+               if (dev->mode != 0) {
+                       udev->mode = dev->mode;
+                       strcpy(udev->owner, dev->owner);
+                       strcpy(udev->group, dev->group);
+               }
+               dbg_parse("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+                       dev->sysfs_file, dev->sysfs_value, udev->name, 
+                       dev->owner, dev->group, dev->mode);
 
-                       continue;
+               return 0;
+       }
+       return -ENODEV;
+}
 
-label_found:
-                       tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
-                       dbg_parse("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, tmpattr->value, dev->sysfs_value);
-                       if (strcmp(dev->sysfs_value, tmpattr->value) != 0) {
-                               if (class_dev_parent) 
-                                       sysfs_close_class_device(class_dev_parent);
-                               continue;
-                       }
+static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+{
+       struct config_device *dev;
+       struct list_head *tmp;
+       char path[SYSFS_PATH_MAX];
+       int found;
+       char *temp = NULL;
 
-                       strcpy(udev->name, dev->name);
-                       if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
-                               temp = &class_dev->path[strlen(class_dev->path)-1];
-                               strcat(udev->name, temp);
-                       }
-                       if (dev->mode != 0) {
-                               udev->mode = dev->mode;
-                               strcpy(udev->owner, dev->owner);
-                               strcpy(udev->group, dev->group);
-                       }
-                       dbg_parse("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-                               dev->sysfs_file, dev->sysfs_value, udev->name, 
-                               dev->owner, dev->group, dev->mode);
-                       if (class_dev_parent)
-                               sysfs_close_class_device(class_dev_parent);
-                       goto done;
-                       break;
-                       }
-               case NUMBER:
-                       {
-                       char path[SYSFS_PATH_MAX];
-                       char *temp;
+       /* we have to have a sysfs device for NUMBER to work */
+       if (!sysfs_device)
+               return -ENODEV;
 
-                       found = 0;
-                       if (!class_dev->sysdevice)
-                               continue;
-                       strcpy(path, class_dev->sysdevice->path);
+       list_for_each(tmp, &config_device_list) {
+               dev = list_entry(tmp, struct config_device, node);
+               if (dev->type != NUMBER)
+                       continue;
+
+               found = 0;
+               strcpy(path, sysfs_device->path);
+               temp = strrchr(path, '/');
+               dbg_parse("NUMBER path = '%s'", path);
+               dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
+               if (strstr(temp, dev->id) != NULL) {
+                       found = 1;
+               } else {
+                       *temp = 0x00;
                        temp = strrchr(path, '/');
-                       dbg_parse("NUMBER path = '%s'", path);
                        dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
-                       if (strstr(temp, dev->id) != NULL) {
+                       if (strstr(temp, dev->id) != NULL)
                                found = 1;
-                       } else {
-                               *temp = 0x00;
-                               temp = strrchr(path, '/');
-                               dbg_parse("NUMBERY temp = '%s' id = '%s'", temp, dev->id);
-                               if (strstr(temp, dev->id) != NULL)
-                                       found = 1;
-                       }
-                       if (!found)
-                               continue;
+               }
+               if (!found)
+                       continue;
+               strcpy(udev->name, dev->name);
+               if (dev->mode != 0) {
+                       udev->mode = dev->mode;
+                       strcpy(udev->owner, dev->owner);
+                       strcpy(udev->group, dev->group);
+               }
+               dbg_parse("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+                       dev->id, udev->name, 
+                       dev->owner, dev->group, dev->mode);
+               return 0;
+       }
+       return -ENODEV;
+}
 
-                       strcpy(udev->name, dev->name);
-                       if (dev->mode != 0) {
-                               udev->mode = dev->mode;
-                               strcpy(udev->owner, dev->owner);
-                               strcpy(udev->group, dev->group);
-                       }
-                       dbg_parse("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-                               dev->id, udev->name, 
-                               dev->owner, dev->group, dev->mode);
-                       goto done;
-                       break;
-                       }
-               case TOPOLOGY:
-                       {
-                       char path[SYSFS_PATH_MAX];
-                       char *temp;
 
-                       if (!class_dev->sysdevice)
-                               continue;
-                       found = 0;      
-                       strcpy(path, class_dev->sysdevice->path);
+static int do_topology(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+{
+       struct config_device *dev;
+       struct list_head *tmp;
+       char path[SYSFS_PATH_MAX];
+       int found;
+       char *temp = NULL;
+
+       /* we have to have a sysfs device for TOPOLOGY to work */
+       if (!sysfs_device)
+               return -ENODEV;
+
+       list_for_each(tmp, &config_device_list) {
+               dev = list_entry(tmp, struct config_device, node);
+               if (dev->type != TOPOLOGY)
+                       continue;
+
+               found = 0;
+               strcpy(path, sysfs_device->path);
+               temp = strrchr(path, '/');
+               dbg_parse("TOPOLOGY path = '%s'", path);
+               dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
+               if (strstr(temp, dev->place) != NULL) {
+                       found = 1;
+               } else {
+                       *temp = 0x00;
                        temp = strrchr(path, '/');
-                       dbg_parse("TOPOLOGY path = '%s'", path);
                        dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
-                       if (strstr(temp, dev->place) != NULL) {
+                       if (strstr(temp, dev->place) != NULL)
                                found = 1;
-                       } else {
-                               *temp = 0x00;
+               }
+               if (!found)
+                       continue;
+
+               strcpy(udev->name, dev->name);
+               if (dev->mode != 0) {
+                       udev->mode = dev->mode;
+                       strcpy(udev->owner, dev->owner);
+                       strcpy(udev->group, dev->group);
+               }
+               dbg_parse("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+                       dev->place, udev->name, 
+                       dev->owner, dev->group, dev->mode);
+               
+               return 0;
+       }
+       return -ENODEV;
+}
+
+static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+       struct config_device *dev;
+       struct list_head *tmp;
+
+       list_for_each(tmp, &config_device_list) {
+               dev = list_entry(tmp, struct config_device, node);
+               if (dev->type != REPLACE)
+                       continue;
+
+               dbg_parse("REPLACE: replace name '%s' with '%s'",
+                         dev->kernel_name, dev->name);
+               if (strcmp(dev->kernel_name, class_dev->name) != 0)
+                       continue;
+
+               strcpy(udev->name, dev->name);
+               if (dev->mode != 0) {
+                       udev->mode = dev->mode;
+                       strcpy(udev->owner, dev->owner);
+                       strcpy(udev->group, dev->group);
+               }
+               dbg_parse("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+                       dev->kernel_name, udev->name, 
+                       dev->owner, dev->group, dev->mode);
+               
+               return 0;
+       }
+       return -ENODEV;
+}
+
+static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+       struct sysfs_device *sysfs_device = NULL;
+       struct sysfs_class_device *class_dev_parent = NULL;
+       int retval = 0;
+       char *temp = NULL;
+
+       udev->mode = 0;
+
+       /* find the sysfs_device for this class device */
+       /* Wouldn't it really be nice if libsysfs could do this for us? */
+       if (class_dev->sysdevice) {
+               sysfs_device = class_dev->sysdevice;
+       } else {
+               /* bah, let's go backwards up a level to see if the device is there,
+                * as block partitions don't point to the physical device.  Need to fix that
+                * up in the kernel...
+                */
+               if (strstr(class_dev->path, "block")) {
+                       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...");
+                               strcpy(path, class_dev->path);
                                temp = strrchr(path, '/');
-                               dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
-                               if (strstr(temp, dev->place) != NULL)
-                                       found = 1;
+                               *temp = 0x00;
+                               dbg_parse("looking for a class device at '%s'", path);
+                               class_dev_parent = sysfs_open_class_device(path);
+                               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);
+                                       if (class_dev_parent->sysdevice)
+                                               sysfs_device = class_dev_parent->sysdevice;
+                               }
                        }
-                       if (!found)
-                               continue;
+               }
+       }
+               
+       if (sysfs_device) {
+               dbg_parse("sysfs_device->path = '%s'", sysfs_device->path);
+               dbg_parse("sysfs_device->bus_id = '%s'", sysfs_device->bus_id);
+       } else {
+               dbg_parse("class_dev->name = '%s'", class_dev->name);
+       }
 
-                       strcpy(udev->name, dev->name);
-                       if (dev->mode != 0) {
-                               udev->mode = dev->mode;
-                               strcpy(udev->owner, dev->owner);
-                               strcpy(udev->group, dev->group);
-                       }
-                       dbg_parse("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-                               dev->place, udev->name, 
-                               dev->owner, dev->group, dev->mode);
-                       goto done;
-                       break;
-                       }
-               case CALLOUT:
-                       {
-                       char value[ID_SIZE];
+       /* rules are looked at in priority order */
+       retval = do_callout(class_dev, udev);
+       if (retval == 0)
+               goto done;
 
-                       if (exec_callout(dev, value, sizeof(value)))
-                               continue;
-                       if (strncmp(value, dev->id, sizeof(value)) != 0)
-                               continue;
-                       strcpy(udev->name, dev->name);
-                       if (dev->mode != 0) {
-                               udev->mode = dev->mode;
-                               strcpy(udev->owner, dev->owner);
-                               strcpy(udev->group, dev->group);
-                       }
-                       dbg_parse("device callout '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-                               dev->id, udev->name, 
-                               dev->owner, dev->group, dev->mode);
-                       goto done;
-                       break;
-                       }
-               case REPLACE:
-                       if (strcmp(dev->kernel_name, class_dev->name) != 0)
-                               continue;
-                       strcpy(udev->name, dev->name);
-                       if (dev->mode != 0) {
-                               udev->mode = dev->mode;
-                               strcpy(udev->owner, dev->owner);
-                               strcpy(udev->group, dev->group);
+       retval = do_label(class_dev, udev, sysfs_device);
+       if (retval == 0)
+               goto done;
+
+       retval = do_number(class_dev, udev, sysfs_device);
+       if (retval == 0)
+               goto done;
+
+       retval = do_topology(class_dev, udev, sysfs_device);
+       if (retval == 0)
+               goto done;
+
+       retval = do_replace(class_dev, udev);
+       if (retval == 0)
+               goto done;
+
+       strcpy(udev->name, class_dev->name);
+
+done:
+       /* substitute placeholder in NAME  */
+       while (1) {
+               char *pos = strchr(udev->name, '%');
+               char *dig;
+               char name[NAME_SIZE];
+               if (pos) {
+                       strcpy(name, pos+2);
+                       *pos = 0x00;
+                       switch (pos[1]) {
+                       case 'b':
+                               if (!sysfs_device)
+                                       break;
+                               strcat(udev->name, sysfs_device->bus_id);
+                               dbg("bus_id appended: %s", 
+                                               sysfs_device->bus_id);
+                               break;
+                       case 'n':
+                               dig = class_dev->name + strlen(class_dev->name);
+                               while (isdigit(*(dig-1)))
+                                       dig--;
+                               strcat(udev->name, dig);
+                               dbg("kernel number appended: %s", dig);
+                               break;
+                       case 'm':
+                               sprintf(pos, "%u", udev->minor);
+                               dbg("minor number appended: %u", udev->minor);
+                               break;
+                       case 'M':
+                               sprintf(pos, "%u", udev->major);
+                               dbg("major number appended: %u", udev->major);
+                               break;
+                       default:
+                               dbg("unknown substitution type: %%%c", pos[1]);
+                               break;
                        }
-                       dbg_parse("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-                               dev->kernel_name, udev->name, 
-                               dev->owner, dev->group, dev->mode);
-                       goto done;
-                       break;
-               case KERNEL_NAME:
-                       break;
-               default:
-                       dbg_parse("Unknown type of device '%d'", dev->type);
+                       strcat(udev->name, name);
+               } else
                        break;
-               }       
        }
-       strcpy(udev->name, class_dev->name);
 
-done:
        /* mode was never set above */
        if (!udev->mode) {
                udev->mode = get_default_mode(class_dev);
                udev->owner[0] = 0x00;
                udev->group[0] = 0x00;
        }
-       return retval;
+
+       if (class_dev_parent)
+               sysfs_close_class_device(class_dev_parent);
+
+       return 0;
 }
 
 int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev)