X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.c;h=deb1d929e0fe38927ce0960422adf3305f3dc876;hb=5c6f0fb0dcd999b96097b38311df439a85b6b799;hp=a010979052aedefd99b7ea281bf83f79e8ba1bab;hpb=53dc383ee90b6699b85f2843247389f5adeb8d50;p=elogind.git diff --git a/namedev.c b/namedev.c index a01097905..deb1d929e 100644 --- a/namedev.c +++ b/namedev.c @@ -50,6 +50,19 @@ static LIST_HEAD(config_device_list); +/* s2 may end with '*' to match everything */ +static int strncmp_wildcard(char *s1, char *s2, int max) +{ + int len = strlen(s2); + if (len > max) + len = max; + if (s2[len-1] == '*') + len--; + else + len = max; + return strncmp(s1, s2, len); +} + static void dump_dev(struct config_device *dev) { switch (dev->type) { @@ -109,16 +122,10 @@ static int add_dev(struct config_device *new_dev) /* update the values if we already have the device */ list_for_each(tmp, &config_device_list) { struct config_device *dev = list_entry(tmp, struct config_device, node); - int len = strlen(new_dev->name); - if (new_dev->name[len-1] == '*') { - len--; - if (strncmp(dev->name, new_dev->name, len)) - continue; - } else { - if (strcmp(dev->name, new_dev->name)) - continue; - } - /* the same, copy the new info into this structure */ + 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); @@ -127,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; @@ -137,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; } @@ -211,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; } @@ -227,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)) @@ -408,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; } @@ -421,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)) @@ -440,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", @@ -482,6 +494,75 @@ static mode_t get_default_mode(struct sysfs_class_device *class_dev) return 0666; } +static void build_kernel_number(struct sysfs_class_device *class_dev, struct udevice *udev) +{ + char *dig; + + /* FIXME, figure out how to handle stuff like sdaj which will not work right now. */ + dig = class_dev->name + strlen(class_dev->name); + while (isdigit(*(dig-1))) + dig--; + strfieldcpy(udev->kernel_number, dig); + dbg("kernel_number='%s'", udev->kernel_number); +} + +static void apply_format(struct udevice *udev, unsigned char *string) +{ + char name[NAME_SIZE]; + char *pos; + + while (1) { + pos = strchr(string, '%'); + + if (pos) { + strfieldcpy(name, pos+2); + *pos = 0x00; + switch (pos[1]) { + case 'b': + if (strlen(udev->bus_id) == 0) + break; + strcat(pos, udev->bus_id); + dbg("substitute bus_id '%s'", udev->bus_id); + break; + case 'n': + if (strlen(udev->kernel_number) == 0) + break; + 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); + break; + case 'M': + sprintf(pos, "%u", udev->major); + dbg("substitute major number '%u'", udev->major); + break; + case 'c': + if (strlen(udev->callout_value) == 0) + break; + strcat(pos, udev->callout_value); + dbg("substitute callout output '%s'", udev->callout_value); + break; + default: + dbg("unknown substitution type '%%%c'", pos[1]); + break; + } + strcat(string, name); + } else + break; + } +} + static int exec_callout(struct config_device *dev, char *value, int len) { @@ -543,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) { @@ -572,20 +653,27 @@ 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; - char value[ID_SIZE]; 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))) + 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)) continue; - if (strncmp(value, dev->id, sizeof(value)) != 0) + if (strncmp_wildcard(udev->callout_value, dev->id, NAME_SIZE) != 0) continue; strfieldcpy(udev->name, dev->name); if (dev->mode != 0) { @@ -594,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; @@ -613,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); @@ -668,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, '/'); @@ -698,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; @@ -716,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, '/'); @@ -747,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; @@ -758,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); @@ -784,17 +885,12 @@ static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice * int len; strfieldcpy(udev->name, class_dev->name); + /* look for permissions */ list_for_each(tmp, &config_device_list) { dev = list_entry(tmp, struct config_device, node); len = strlen(dev->name); - if (dev->name[len-1] == '*') { - len--; - if (strncmp(dev->name, class_dev->name, len)) - continue; - } else { - if (strcmp(dev->name, class_dev->name)) - continue; - } + if (strncmp_wildcard(class_dev->name, dev->name, sizeof(dev->name))) + continue; if (dev->mode != 0) { dbg_parse("found permissions for '%s'", class_dev->name); udev->mode = dev->mode; @@ -804,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; @@ -823,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; @@ -836,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; } @@ -847,12 +943,16 @@ 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); } + 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; @@ -868,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; @@ -877,44 +977,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev) found: /* 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("substitute bus_id '%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("substitute kernel number '%s'", dig); - break; - case 'm': - sprintf(pos, "%u", udev->minor); - dbg("substitute minor number '%u'", udev->minor); - break; - case 'M': - sprintf(pos, "%u", udev->major); - dbg("substitute major number '%u'", udev->major); - break; - default: - dbg("unknown substitution type '%%%c'", pos[1]); - break; - } - strcat(udev->name, name); - } else - break; - } + apply_format(udev, udev->name); done: /* mode was never set above */ @@ -930,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;