make WAIT_FOR_SYSFS usable in non "wait-only" rules

[elogind.git] / udev_rules.c

diff --git a/udev_rules.c b/udev_rules.c
index 90dc0243fe6f8a27041ca363bff80ad9d9804017..e9b32df1c66d85a838a311f160ae889955d0f90e 100644 (file)
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -348,14 +348,14 @@ 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);
@@ -733,19 +733,13 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
        }
 
        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 */
@@ -781,6 +775,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));
@@ -994,6 +990,7 @@ 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));
                                udev_rules_apply_format(udev, udev->name, sizeof(udev->name));
@@ -1008,17 +1005,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 +1069,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));
-                               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;
                        }