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);
}
if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
- int match;
+ int found;
- match = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
- if (match && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH)) {
- dbg("WAIT_FOR_SYSFS is true (matching value)");
- return 0;
- }
- if (!match && (rule->wait_for_sysfs.operation == KEY_OP_NOMATCH)) {
- dbg("WAIT_FOR_SYSFS is true, (non matching value)");
- return 0;
+ found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
+ if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH)) {
+ dbg("WAIT_FOR_SYSFS failed");
+ goto nomatch;
}
- dbg("WAIT_FOR_SYSFS is false");
- return -1;
}
/* walk up the chain of parent devices and find a match */
size_t len;
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));
/* 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));
udev_rules_apply_format(udev, udev->name, sizeof(udev->name));
}
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));
- 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));
- udev_rules_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;
}