split up long line

[elogind.git] / udev / udev-rules.c

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 796d2c157fa6eccbf20c21ac3acd3bcdccd90956..ccf1eaaf8f43b5027038780be1975dce2349148c 100644 (file)
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -451,15 +451,10 @@ static int add_string(struct udev_rules *rules, const char *str)
        unsigned int off;
        struct trie_node *parent;
 
-       len = strlen(str);
-
-       /* offset 0 is always '\0' */
-       if (len == 0)
-               return 0;
-
        /* walk trie, start from last character of str to find matching tails */
-       node_idx = 0;
+       len = strlen(str);
        key = str[len-1];
+       node_idx = 0;
        for (depth = 0; depth <= len; depth++) {
                struct trie_node *node;
                unsigned int child_idx;
@@ -1140,6 +1135,7 @@ static int add_rule(struct udev_rules *rules, char *line,
        char *linepos;
        char *attr;
        int physdev = 0;
+       int waitfor = 0;
        struct rule_tmp rule_tmp;
 
        memset(&rule_tmp, 0x00, sizeof(struct rule_tmp));
@@ -1400,6 +1396,7 @@ static int add_rule(struct udev_rules *rules, char *line,
                if (strcasecmp(key, "WAIT_FOR") == 0 || strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
                        rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
                        valid = 1;
+                       waitfor = 1;
                        continue;
                }
 
@@ -1457,10 +1454,10 @@ static int add_rule(struct udev_rules *rules, char *line,
                        uid = strtoul(value, &endptr, 10);
                        if (endptr[0] == '\0') {
                                rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
-                       } else if (rules->resolve_names && strchr("$%", value[0]) == NULL) {
+                       } else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) {
                                uid = add_uid(rules, value);
                                rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
-                       } else {
+                       } else if (rules->resolve_names == 0) {
                                rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL);
                        }
                        rule_tmp.rule.rule.flags = 1;
@@ -1475,10 +1472,10 @@ static int add_rule(struct udev_rules *rules, char *line,
                        gid = strtoul(value, &endptr, 10);
                        if (endptr[0] == '\0') {
                                rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
-                       } else if (rules->resolve_names && strchr("$%", value[0]) == NULL) {
+                       } else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) {
                                gid = add_gid(rules, value);
                                rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
-                       } else {
+                       } else if (rules->resolve_names == 0) {
                                rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL);
                        }
                        rule_tmp.rule.rule.flags = 1;
@@ -1549,11 +1546,11 @@ static int add_rule(struct udev_rules *rules, char *line,
                err(rules->udev, "unknown key '%s' in %s:%u\n", key, filename, lineno);
        }
 
-       if (physdev)
-               err(rules->udev, "PHYSDEV* values are deprecated and not available on recent kernels, \n"
-                   "please fix it in %s:%u", filename, lineno);
+       if (physdev && !waitfor)
+               err(rules->udev, "PHYSDEV* values are deprecated and not available on recent kernels, "
+                   "please fix it in %s:%u\n", filename, lineno);
 
-       /* skip line if not any valid key was found */
+       /* skip line if no valid key was found */
        if (!valid)
                goto invalid;
 
@@ -1652,7 +1649,7 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
        dbg(udev, "open directory '%s'\n", dirname);
        dir = opendir(dirname);
        if (dir == NULL) {
-               err(udev, "unable to open '%s': %m\n", dirname);
+               info(udev, "unable to open '%s': %m\n", dirname);
                return -1;
        }
 
@@ -1723,7 +1720,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
        if (rules->trie_nodes == NULL)
                return NULL;
        rules->trie_nodes_max = PREALLOC_TRIE;
-       /* offset 0 is the trie root */
+       /* offset 0 is the trie root, with an empty string */
        memset(rules->trie_nodes, 0x00, sizeof(struct trie_node));
        rules->trie_nodes_cur = 1;
 
@@ -2022,7 +2019,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        rule = cur;
                        /* possibly skip rules which want to set NAME, SYMLINK, OWNER, GROUP, MODE */
                        if (!can_set_name && rule->rule.flags)
-                               ;//goto nomatch;
+                               goto nomatch;
                        esc = ESCAPE_UNSET;
                        break;
                case TK_M_ACTION:
@@ -2062,13 +2059,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                        break;
                case TK_M_ENV:
                        {
-                               struct udev_list_entry *list_entry;
                                const char *key_name = &rules->buf[cur->key.attr_off];
                                const char *value;
 
-                               list_entry = udev_device_get_properties_list_entry(event->dev);
-                               list_entry = udev_list_entry_get_by_name(list_entry, key_name);
-                               value = udev_list_entry_get_value(list_entry);
+                               value = udev_device_get_property_value(event->dev, key_name);
                                if (value == NULL) {
                                        dbg(event->udev, "ENV{%s} is not set, treat as empty\n", key_name);
                                        value = "";
@@ -2510,9 +2504,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                     rule->rule.filename_line);
                                f = fopen(attr, "w");
                                if (f != NULL) {
-                                       if (!event->test)
-                                               if (fprintf(f, "%s", value) <= 0)
-                                                       err(event->udev, "error writing ATTR{%s}: %m\n", attr);
+                                       if (fprintf(f, "%s", value) <= 0)
+                                               err(event->udev, "error writing ATTR{%s}: %m\n", attr);
                                        fclose(f);
                                } else {
                                        err(event->udev, "error opening ATTR{%s} for writing: %m\n", attr);