#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);
return -1;
}
+/** Finds the lowest positive N such that <name>N isn't present in
+ * $(udevroot) either as a file or a symlink.
+ *
+ * @param name Name to check for
+ * @return 0 if <name> 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)
char *rest;
int slen;
struct sysfs_attribute *tmpattr;
+ unsigned int next_free_number;
pos = string;
while (1) {
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);
break;
/* 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]);
/* 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 {