X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=ccc675064d543452eda48ef0acdca9d5428dcfc5;hp=99542dc4d668a1216eb92e5f2ee7ee6cbfd1e718;hb=a43180955a49a6838f7ce564db3cc1d10f36b8fb;hpb=6c5c770ac62791fd514f3eee9e7a5a831eef8d32 diff --git a/namedev.c b/namedev.c index 99542dc4d..ccc675064 100644 --- a/namedev.c +++ b/namedev.c @@ -144,37 +144,15 @@ static void dump_dev_list(void) dump_dev(dev); } } - -static int get_value(const char *left, char **orig_string, char **ret_string) -{ - char *temp; - char *string = *orig_string; - - /* eat any whitespace */ - while (isspace(*string)) - ++string; - - /* split based on '=' */ - temp = strsep(&string, "="); - if (strcasecmp(temp, left) == 0) { - /* got it, now strip off the '"' */ - while (isspace(*string)) - ++string; - if (*string == '"') - ++string; - temp = strsep(&string, "\""); - *ret_string = temp; - *orig_string = string; - return 0; - } - return -ENODEV; -} static int get_pair(char **orig_string, char **left, char **right) { char *temp; char *string = *orig_string; + if (!string) + return -ENODEV; + /* eat any whitespace */ while (isspace(*string)) ++string; @@ -182,22 +160,43 @@ static int get_pair(char **orig_string, char **left, char **right) /* split based on '=' */ temp = strsep(&string, "="); *left = temp; + if (!string) + return -ENODEV; /* take the right side and strip off the '"' */ while (isspace(*string)) ++string; if (*string == '"') ++string; + else + return -ENODEV; + temp = strsep(&string, "\""); + if (!string || *temp == '\0') + return -ENODEV; *right = temp; *orig_string = string; return 0; } +static int get_value(const char *left, char **orig_string, char **ret_string) +{ + int retval; + char *left_string; + + retval = get_pair(orig_string, &left_string, ret_string); + if (retval) + return retval; + if (strcasecmp(left_string, left) != 0) + return -ENODEV; + return 0; +} + static int namedev_init_config(void) { char line[255]; + int lineno; char *temp; char *temp2; char *temp3; @@ -213,11 +212,13 @@ static int namedev_init_config(void) } /* loop through the whole file */ + lineno = 0; while (1) { /* get a line */ temp = fgets(line, sizeof(line), fd); if (temp == NULL) - break; + goto exit; + lineno++; dbg_parse("read %s", temp); @@ -244,23 +245,23 @@ static int namedev_init_config(void) /* BUS="bus" */ retval = get_value("BUS", &temp, &temp3); if (retval) - continue; - strcpy(dev.bus, temp3); + break; + strfieldcpy(dev.bus, temp3); /* file="value" */ temp2 = strsep(&temp, ","); retval = get_pair(&temp, &temp2, &temp3); if (retval) - continue; - strcpy(dev.sysfs_file, temp2); - strcpy(dev.sysfs_value, temp3); + break; + strfieldcpy(dev.sysfs_file, temp2); + strfieldcpy(dev.sysfs_value, temp3); /* NAME="new_name" */ temp2 = strsep(&temp, ","); retval = get_value("NAME", &temp, &temp3); if (retval) - continue; - strcpy(dev.name, temp3); + break; + strfieldcpy(dev.name, temp3); dbg_parse("LABEL name = '%s', bus = '%s', " "sysfs_file = '%s', sysfs_value = '%s'", @@ -275,22 +276,22 @@ static int namedev_init_config(void) /* BUS="bus" */ retval = get_value("BUS", &temp, &temp3); if (retval) - continue; - strcpy(dev.bus, temp3); + break; + strfieldcpy(dev.bus, temp3); /* ID="id" */ temp2 = strsep(&temp, ","); retval = get_value("id", &temp, &temp3); if (retval) - continue; - strcpy(dev.id, temp3); + break; + strfieldcpy(dev.id, temp3); /* NAME="new_name" */ temp2 = strsep(&temp, ","); retval = get_value("NAME", &temp, &temp3); if (retval) - continue; - strcpy(dev.name, temp3); + break; + strfieldcpy(dev.name, temp3); dbg_parse("NUMBER name = '%s', bus = '%s', id = '%s'", dev.name, dev.bus, dev.id); @@ -303,22 +304,22 @@ static int namedev_init_config(void) /* BUS="bus" */ retval = get_value("BUS", &temp, &temp3); if (retval) - continue; - strcpy(dev.bus, temp3); + break; + strfieldcpy(dev.bus, temp3); /* PLACE="place" */ temp2 = strsep(&temp, ","); retval = get_value("place", &temp, &temp3); if (retval) - continue; - strcpy(dev.place, temp3); + break; + strfieldcpy(dev.place, temp3); /* NAME="new_name" */ temp2 = strsep(&temp, ","); retval = get_value("NAME", &temp, &temp3); if (retval) - continue; - strcpy(dev.name, temp3); + break; + strfieldcpy(dev.name, temp3); dbg_parse("TOPOLOGY name = '%s', bus = '%s', place = '%s'", dev.name, dev.bus, dev.place); @@ -331,15 +332,15 @@ static int namedev_init_config(void) /* KERNEL="kernel_name" */ retval = get_value("KERNEL", &temp, &temp3); if (retval) - continue; - strcpy(dev.kernel_name, temp3); + break; + strfieldcpy(dev.kernel_name, temp3); /* NAME="new_name" */ temp2 = strsep(&temp, ","); retval = get_value("NAME", &temp, &temp3); if (retval) - continue; - strcpy(dev.name, temp3); + break; + strfieldcpy(dev.name, temp3); dbg_parse("REPLACE name = %s, kernel_name = %s", dev.name, dev.kernel_name); } @@ -350,29 +351,29 @@ static int namedev_init_config(void) /* PROGRAM="executable" */ retval = get_value("PROGRAM", &temp, &temp3); if (retval) - continue; - strcpy(dev.exec_program, temp3); + break; + strfieldcpy(dev.exec_program, temp3); /* BUS="bus" */ temp2 = strsep(&temp, ","); retval = get_value("BUS", &temp, &temp3); if (retval) - continue; - strcpy(dev.bus, temp3); + break; + strfieldcpy(dev.bus, temp3); /* ID="id" */ temp2 = strsep(&temp, ","); retval = get_value("ID", &temp, &temp3); if (retval) - continue; - strcpy(dev.id, temp3); + break; + strfieldcpy(dev.id, temp3); /* NAME="new_name" */ temp2 = strsep(&temp, ","); retval = get_value("NAME", &temp, &temp3); if (retval) - continue; - strcpy(dev.name, temp3); + break; + strfieldcpy(dev.name, temp3); dbg_parse("CALLOUT name = %s, program = %s", dev.name, dev.exec_program); } @@ -383,7 +384,8 @@ static int namedev_init_config(void) goto exit; } } - + dbg_parse("%s:%d:%Zd: error parsing ``%s''", udev_config_filename, + lineno, temp - line, temp); exit: fclose(fd); return retval; @@ -537,232 +539,332 @@ 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; + strfieldcpy(udev->name, dev->name); + if (dev->mode != 0) { + udev->mode = dev->mode; + strfieldcpy(udev->owner, dev->owner); + strfieldcpy(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; + 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); + strfieldcpy(udev->name, dev->name); + if (dev->mode != 0) { + udev->mode = dev->mode; + strfieldcpy(udev->owner, dev->owner); + strfieldcpy(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; - - found = 0; - if (!class_dev->sysdevice) - continue; - strcpy(path, class_dev->sysdevice->path); + /* we have to have a sysfs device for NUMBER 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 != NUMBER) + continue; + + found = 0; + strfieldcpy(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; - - 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); + } + if (!found) + continue; + strfieldcpy(udev->name, dev->name); + if (dev->mode != 0) { + udev->mode = dev->mode; + strfieldcpy(udev->owner, dev->owner); + strfieldcpy(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; +} + + +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; + strfieldcpy(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; + + strfieldcpy(udev->name, dev->name); + if (dev->mode != 0) { + udev->mode = dev->mode; + strfieldcpy(udev->owner, dev->owner); + strfieldcpy(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; + + strfieldcpy(udev->name, dev->name); + if (dev->mode != 0) { + udev->mode = dev->mode; + strfieldcpy(udev->owner, dev->owner); + strfieldcpy(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..."); + strfieldcpy(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; - } - 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); - goto done; - break; - } - case CALLOUT: - { - char value[ID_SIZE]; - - 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; + *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; + } } - 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); + } + } + + 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); + } + + /* rules are looked at in priority order */ + retval = do_callout(class_dev, udev); + if (retval == 0) + goto done; + + 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; + + strfieldcpy(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) { + strfieldcpy(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: + strcat(udev->name, name); + } else break; - default: - dbg_parse("Unknown type of device '%d'", dev->type); - 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)