snprintf(filename, sizeof(filename), "%s%s/%s", sysfs_path, udev->dev->devpath, file);
filename[sizeof(filename)-1] = '\0';
- dbg("wait %i sec for '%s'", timeout, filename);
+ dbg("will wait %i sec for '%s'", timeout, filename);
while (--loop) {
if (stat(filename, &stats) == 0) {
info("file '%s' appeared after %i loops", filename, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
return 0;
}
- info("wait for %i mseconds", 1000 / WAIT_LOOP_PER_SECOND);
+ info("wait for '%s' for %i mseconds", filename, 1000 / WAIT_LOOP_PER_SECOND);
usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
}
err("waiting for '%s' failed", filename);
return -1;
}
-static void apply_format(struct udevice *udev, char *string, size_t maxsize)
+void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
{
char temp[PATH_SIZE];
char temp2[PATH_SIZE];
SUBST_DEVPATH,
SUBST_KERNEL_NUMBER,
SUBST_KERNEL_NAME,
+ SUBST_ID,
SUBST_MAJOR,
SUBST_MINOR,
SUBST_RESULT,
{ .name = "devpath", .fmt = 'p', .type = SUBST_DEVPATH },
{ .name = "number", .fmt = 'n', .type = SUBST_KERNEL_NUMBER },
{ .name = "kernel", .fmt = 'k', .type = SUBST_KERNEL_NAME },
+ { .name = "id", .fmt = 'b', .type = SUBST_ID },
{ .name = "major", .fmt = 'M', .type = SUBST_MAJOR },
{ .name = "minor", .fmt = 'm', .type = SUBST_MINOR },
{ .name = "result", .fmt = 'c', .type = SUBST_RESULT },
strlcat(string, udev->dev->kernel_number, maxsize);
dbg("substitute kernel number '%s'", udev->dev->kernel_number);
break;
+ case SUBST_ID:
+ if (udev->dev_parent != NULL) {
+ strlcat(string, udev->dev_parent->kernel_name, maxsize);
+ dbg("substitute id '%s'", udev->dev_parent->kernel_name);
+ }
+ break;
case SUBST_MAJOR:
sprintf(temp2, "%d", major(udev->devt));
strlcat(string, temp2, maxsize);
/* match a single rule against a given device and possibly its parent devices */
static int match_rule(struct udevice *udev, struct udev_rule *rule)
{
- struct sysfs_device *dev_parent;
int i;
if (match_key("ACTION", rule, &rule->action, udev->action))
- goto exit;
+ goto nomatch;
if (match_key("KERNEL", rule, &rule->kernel_name, udev->dev->kernel_name))
- goto exit;
+ goto nomatch;
if (match_key("SUBSYSTEM", rule, &rule->subsystem, udev->dev->subsystem))
- goto exit;
+ goto nomatch;
if (match_key("DEVPATH", rule, &rule->devpath, udev->dev->devpath))
- goto exit;
+ goto nomatch;
if (rule->modalias.operation != KEY_OP_UNSET) {
const char *value;
value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
if (value == NULL) {
dbg("MODALIAS value not found");
- goto exit;
+ goto nomatch;
}
if (match_key("MODALIAS", rule, &rule->modalias, value))
- goto exit;
+ goto nomatch;
}
for (i = 0; i < rule->env.count; i++) {
value = "";
}
if (match_key("ENV", rule, &pair->key, value))
- goto exit;
+ goto nomatch;
}
}
return -1;
}
- /* walk up the chain of physical devices and find a match */
- dev_parent = udev->dev;
+ /* walk up the chain of parent devices and find a match */
+ udev->dev_parent = udev->dev;
while (1) {
/* check for matching driver */
if (rule->driver.operation != KEY_OP_UNSET) {
- if (match_key("DRIVER", rule, &rule->driver, dev_parent->driver))
+ if (match_key("DRIVER", rule, &rule->driver, udev->dev_parent->driver))
goto try_parent;
}
- /* check for matching bus value */
+ /* check for matching subsystem/bus value */
if (rule->bus.operation != KEY_OP_UNSET) {
- if (match_key("BUS", rule, &rule->bus, dev_parent->subsystem))
+ if (match_key("BUS", rule, &rule->bus, udev->dev_parent->subsystem))
goto try_parent;
}
- /* check for matching bus id */
+ /* check for matching bus id (device name) */
if (rule->id.operation != KEY_OP_UNSET) {
- if (match_key("ID", rule, &rule->id, dev_parent->kernel_name))
+ if (match_key("ID", rule, &rule->id, udev->dev_parent->kernel_name))
goto try_parent;
}
char val[VALUE_SIZE];
size_t len;
- value = sysfs_attr_get_value(dev_parent->devpath, key_name);
+ value = sysfs_attr_get_value(udev->dev_parent->devpath, key_name);
+ if (value == NULL)
+ value = sysfs_attr_get_value(udev->dev->devpath, key_name);
if (value == NULL)
goto try_parent;
strlcpy(val, value, sizeof(val));
/* found matching device */
break;
try_parent:
+ /* move to parent device */
dbg("try parent sysfs device");
- dev_parent = sysfs_device_get_parent(dev_parent);
- if (dev_parent == NULL)
- goto exit;
- dbg("looking at dev_parent->devpath='%s'", dev_parent->devpath);
- dbg("looking at dev_parent->bus_kernel_name='%s'", dev_parent->kernel_name);
+ udev->dev_parent = sysfs_device_get_parent(udev->dev_parent);
+ if (udev->dev_parent == NULL)
+ goto nomatch;
+ dbg("looking at dev_parent->devpath='%s'", udev->dev_parent->devpath);
+ dbg("looking at dev_parent->bus_kernel_name='%s'", udev->dev_parent->kernel_name);
}
/* execute external program */
char result[PATH_SIZE];
strlcpy(program, key_val(rule, &rule->program), sizeof(program));
- apply_format(udev, program, sizeof(program));
+ udev_rules_apply_format(udev, program, sizeof(program));
if (run_program(program, udev->dev->subsystem, result, sizeof(result), NULL, (udev_log_priority >= LOG_INFO)) != 0) {
dbg("PROGRAM is false");
udev->program_result[0] = '\0';
if (rule->program.operation != KEY_OP_NOMATCH)
- goto exit;
+ goto nomatch;
} else {
int count;
strlcpy(udev->program_result, result, sizeof(udev->program_result));
dbg("PROGRAM returned successful");
if (rule->program.operation == KEY_OP_NOMATCH)
- goto exit;
+ goto nomatch;
}
dbg("PROGRAM key is true");
}
/* check for matching result of external program */
if (match_key("RESULT", rule, &rule->result, udev->program_result))
- goto exit;
+ goto nomatch;
/* import variables returned from program or or file into environment */
if (rule->import.operation != KEY_OP_UNSET) {
int rc = -1;
strlcpy(import, key_val(rule, &rule->import), sizeof(import));
- apply_format(udev, import, sizeof(import));
+ udev_rules_apply_format(udev, import, sizeof(import));
dbg("check for IMPORT import='%s'", import);
if (rule->import_type == IMPORT_PROGRAM) {
rc = import_program_into_env(udev, import);
if (rc != 0) {
dbg("IMPORT failed");
if (rule->import.operation != KEY_OP_NOMATCH)
- goto exit;
+ goto nomatch;
} else
dbg("IMPORT '%s' imported", key_val(rule, &rule->import));
dbg("IMPORT key is true");
return 0;
-exit:
+nomatch:
return -1;
}
if (rule->owner.operation == KEY_OP_ASSIGN_FINAL)
udev->owner_final = 1;
strlcpy(udev->owner, key_val(rule, &rule->owner), sizeof(udev->owner));
- apply_format(udev, udev->owner, sizeof(udev->owner));
+ udev_rules_apply_format(udev, udev->owner, sizeof(udev->owner));
dbg("applied owner='%s' to '%s'", udev->owner, udev->dev->kernel_name);
}
if (!udev->group_final && rule->group.operation != KEY_OP_UNSET) {
if (rule->group.operation == KEY_OP_ASSIGN_FINAL)
udev->group_final = 1;
strlcpy(udev->group, key_val(rule, &rule->group), sizeof(udev->group));
- apply_format(udev, udev->group, sizeof(udev->group));
+ udev_rules_apply_format(udev, udev->group, sizeof(udev->group));
dbg("applied group='%s' to '%s'", udev->group, udev->dev->kernel_name);
}
name_list_cleanup(&udev->symlink_list);
}
strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp));
- apply_format(udev, temp, sizeof(temp));
+ udev_rules_apply_format(udev, temp, sizeof(temp));
count = replace_untrusted_chars(temp);
if (count)
info("%i untrusted character(s) replaced" , count);
/* set name, later rules with name set will be ignored */
if (rule->name.operation != KEY_OP_UNSET) {
int count;
+
name_set = 1;
strlcpy(udev->name, key_val(rule, &rule->name), sizeof(udev->name));
- apply_format(udev, udev->name, sizeof(udev->name));
+ udev_rules_apply_format(udev, udev->name, sizeof(udev->name));
count = replace_untrusted_chars(udev->name);
if (count)
info("%i untrusted character(s) replaced", count);
}
if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
- char program[PATH_SIZE];
-
if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
udev->run_final = 1;
if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
info("reset run list");
name_list_cleanup(&udev->run_list);
}
- strlcpy(program, key_val(rule, &rule->run), sizeof(program));
- apply_format(udev, program, sizeof(program));
- dbg("add run '%s'", program);
- name_list_add(&udev->run_list, program, 0);
+ dbg("add run '%s'", key_val(rule, &rule->run));
+ name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
}
if (rule->last_rule) {
}
if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
- char program[PATH_SIZE];
-
if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
info("reset run list");
name_list_cleanup(&udev->run_list);
}
- strlcpy(program, key_val(rule, &rule->run), sizeof(program));
- apply_format(udev, program, sizeof(program));
- dbg("add run '%s'", program);
- name_list_add(&udev->run_list, program, 0);
+ dbg("add run '%s'", key_val(rule, &rule->run));
+ name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
break;
}
~ianmdlvl / elogind.git / blobdiff