let SYSFS{} look at the device, not only the parent device

[elogind.git] / udev_rules.c

diff --git a/udev_rules.c b/udev_rules.c
index fbcbbe008339bc5f95599aebfa484bc9b7be08b6..8e9c1605bf8aeaf447a2c6eb101832c962cb3e05 100644 (file)
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -348,21 +348,21 @@ static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
 
        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;
 }
 
-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];
@@ -781,6 +781,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
                                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));
@@ -818,7 +820,7 @@ try_parent:
                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';
@@ -851,7 +853,7 @@ try_parent:
                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);
@@ -941,14 +943,14 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                                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);
                        }
 
@@ -965,7 +967,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                                        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);
@@ -994,9 +996,10 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                        /* 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);
@@ -1008,17 +1011,14 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                        }
 
                        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) {
@@ -1075,16 +1075,12 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
                        }
 
                        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;
                        }