X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=c8217024c87070e20a953269105440bf1853d07a;hp=a3ae1d36b3f9786ca04d6c9abde4e97e8110c310;hb=a551c7b0ceb72145a5256cdd53b0b52ff9f766de;hpb=bbbe503ec1a5623a5a8abd003f46fdd8c3581054 diff --git a/namedev.c b/namedev.c index a3ae1d36b..c8217024c 100644 --- a/namedev.c +++ b/namedev.c @@ -32,9 +32,7 @@ #include #include #include -#ifndef __KLIBC__ #include -#endif #include "libsysfs/sysfs/libsysfs.h" #include "list.h" @@ -44,6 +42,7 @@ #include "logging.h" #include "namedev.h" #include "klibc_fixups.h" +#include "udevdb.h" static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr); @@ -181,6 +180,37 @@ static int get_format_len(char **str) return -1; } +/** Finds the lowest positive N such that N isn't present in + * $(udevroot) either as a file or a symlink. + * + * @param name Name to check for + * @return 0 if didn't exist and N otherwise. + */ +static unsigned int find_free_number (struct udevice *udev, char *name) +{ + char temp[NAME_SIZE]; + char path[NAME_SIZE]; + struct udevice dev; + int result; + + /* have to sweep the database for each lookup */ + result = 0; + strncpy(temp, name, sizeof (temp)); + while (1) { + if (udevdb_get_dev_byname(temp, path, &dev) != 0) + goto found; + /* symlink might be stale if $(udevroot) isn't cleaned; check + * on major/minor to see if it's the same device + */ + if (dev.major == udev->major && dev.minor == udev->minor) + goto found; + snprintf (temp, sizeof(temp), "%s%d", name, ++result); + } + +found: + return result; +} + static void apply_format(struct udevice *udev, char *string, size_t maxsize, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device) @@ -197,25 +227,24 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize, char *rest; int slen; struct sysfs_attribute *tmpattr; + unsigned int next_free_number; pos = string; - while (1) { - pos = strchr(string, '%'); - if (pos != NULL) { - pos[0] = '\0'; - tail = pos+1; - len = get_format_len(&tail); - c = tail[0]; - strfieldcpy(temp, tail+1); - tail = temp; - } else { + pos = strchr(pos, '%'); + if (pos == NULL) break; - } - dbg("format=%c, string='%s', tail='%s'",c , string, tail); + pos[0] = '\0'; + tail = pos+1; + len = get_format_len(&tail); + c = tail[0]; + strfieldcpy(temp, tail+1); + tail = temp; + dbg("format=%c, string='%s', tail='%s'",c , string, tail); attr = get_format_attribute(&tail); + switch (c) { case 'b': if (strlen(udev->bus_id) == 0) @@ -286,6 +315,14 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize, break; case '%': strfieldcatmax(string, "%", maxsize); + pos++; + break; + case 'e': + next_free_number = find_free_number(udev, string); + if (next_free_number > 0) { + snprintf(temp2, sizeof(temp2), "%d", next_free_number); + strfieldcatmax(string, temp2, maxsize); + } break; default: dbg("unknown substitution type '%%%c'", c); @@ -396,9 +433,9 @@ static int execute_program(char *path, char *value, int len) /* don't separate if in apostrophes */ pos++; argv[i] = strsep(&pos, "\'"); - while (pos[0] == ' ') + while (pos && pos[0] == ' ') pos++; - } else { + } else { argv[i] = strsep(&pos, " "); } dbg("arg[%i] '%s'", i, argv[i]); @@ -605,6 +642,42 @@ static int match_place(struct config_device *dev, struct sysfs_class_device *cla return 0; } +static int whitelist_search(struct sysfs_class_device *class_dev) +{ + char *sysblock = "/sys/block"; + int i; + + static char *list[] = { + "nb", + "ram", + "loop", + "fd", + "md", + "dos_cd", + "double", + "flash", + "msd", + "rflash", + "rom", + "rrom", + "sbpcd", + "pcd", + "pf", + "scd", + "ubd", + NULL, + }; + + if (strncmp(class_dev->path, sysblock, strlen(sysblock))) + return 0; + + for (i=0; list[i] != NULL; i++) + if (!strncmp(class_dev->name, list[i], strlen(list[i]))) + return 1; + + return 0; +} + static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_dev) { struct sysfs_device *sysfs_device; @@ -618,8 +691,8 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de * all partitions have the symlink in its parent directory. * But we need to watch out for block devices that do not have parents, yet * look like a partition (fd0, loop0, etc.) They all do not have a device - * symlink yet. We do sit and spin on waiting for them right now, we should - * possibly have a whitelist for these devices here... + * symlink yet. We do sit and spin on waiting for them right now unless + * they happen to be in the whitelist in which case we exit. */ class_dev_parent = sysfs_get_classdev_parent(class_dev); if (class_dev_parent != NULL) @@ -629,8 +702,13 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de tspec.tv_nsec = 10000000; /* sleep 10 millisec */ loop = 10; while (loop--) { - if (udev_sleep) + if (udev_sleep) { + if (whitelist_search(class_dev)) { + sysfs_device = NULL; + goto exit; + } nanosleep(&tspec, NULL); + } if (class_dev_parent) sysfs_device = sysfs_get_classdev_device(class_dev_parent); @@ -735,10 +813,12 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas /* execute external program */ if (dev->program[0] != '\0') { + char program[PROGRAM_SIZE]; + dbg("check " FIELD_PROGRAM); - apply_format(udev, dev->program, sizeof(dev->program), - class_dev, sysfs_device); - if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) { + strfieldcpy(program, dev->program); + apply_format(udev, program, sizeof(program), class_dev, sysfs_device); + if (execute_program(program, udev->program_result, NAME_SIZE) != 0) { dbg(FIELD_PROGRAM " returned nonzero"); goto try_parent; } else { @@ -850,13 +930,13 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud found: apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device); + strfieldcpy(udev->config_file, dev->config_file); + udev->config_line = dev->config_line; if (udev->type == 'n') goto done; udev->partitions = dev->partitions; - strfieldcpy(udev->config_file, dev->config_file); - udev->config_line = dev->config_line; /* get permissions given in rule */ set_empty_perms(udev, dev->mode,