fix $attr{[<subsystem>/<sysname>]<attribute>} substitution

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

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 5a2ae1af8237cae967cf62381c968fbb7635434b..a6f9220352de5fc6caa1542019ee7da81f487253 100644 (file)
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -65,6 +65,7 @@ enum string_glob_type {
        GL_FORMAT,
 };
 
+#ifdef DEBUG
 static const char *string_glob_str[] = {
        [GL_UNSET] =            "UNSET",
        [GL_PLAIN] =            "plain",
@@ -74,6 +75,7 @@ static const char *string_glob_str[] = {
        [GL_SOMETHING] =        "split-glob",
        [GL_FORMAT] =           "format",
 };
+#endif
 
 /* tokens of a rule are sorted/handled in this order */
 enum token_type {
@@ -545,11 +547,12 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout)
 {
        struct udev *udev = udev_device_get_udev(dev);
        char filepath[UTIL_PATH_SIZE];
-       char devicepath[UTIL_PATH_SIZE] = "";
+       char devicepath[UTIL_PATH_SIZE];
        struct stat stats;
        int loop = timeout * WAIT_LOOP_PER_SECOND;
 
        /* a relative path is a device attribute */
+       devicepath[0] = '\0';
        if (file[0] != '/') {
                util_strlcpy(devicepath, udev_get_sys_path(udev), sizeof(devicepath));
                util_strlcat(devicepath, udev_device_get_devpath(dev), sizeof(devicepath));
@@ -941,6 +944,7 @@ static void dump_token(struct udev_rules *rules, struct token *token)
                dbg(rules->udev, "* %s\n", token_str[type]);
                break;
        case TK_M_PARENTS_MAX:
+       case TK_M_MAX:
        case TK_UNSET:
                dbg(rules->udev, "unknown type %u\n", type);
                break;
@@ -1707,7 +1711,6 @@ void udev_rules_unref(struct udev_rules *rules)
 
 static int match_key(struct udev_rules *rules, struct token *token, const char *val)
 {
-       const char *key_name = token_str[token->type];
        char *key_value = &rules->buf[token->key.value_off];
        char *pos;
        int match = 0;
@@ -1724,21 +1727,26 @@ static int match_key(struct udev_rules *rules, struct token *token, const char *
                break;
        case GL_SPLIT:
                {
-                       char value[UTIL_PATH_SIZE];
+                       const char *split;
+                       size_t len;
 
-                       util_strlcpy(value, &rules->buf[token->key.value_off], sizeof(value));
-                       key_value = value;
-                       while (key_value != NULL) {
-                               pos = strchr(key_value, '|');
-                               if (pos != NULL) {
-                                       pos[0] = '\0';
-                                       pos = &pos[1];
-                               }
-                               dbg(rules->udev, "match %s '%s' <-> '%s'\n", key_name, key_value, val);
-                               match = (strcmp(key_value, val) == 0);
-                               if (match)
+                       split = &rules->buf[token->key.value_off];
+                       len = strlen(val);
+                       while (1) {
+                               const char *next;
+
+                               next = strchr(split, '|');
+                               if (next != NULL) {
+                                       size_t matchlen = (size_t)(next - split);
+
+                                       match = (matchlen == len && strncmp(split, val, matchlen) == 0);
+                                       if (match)
+                                               break;
+                               } else {
+                                       match = (strcmp(split, val) == 0);
                                        break;
-                               key_value = pos;
+                               }
+                               split = &next[1];
                        }
                        break;
                }
@@ -1754,7 +1762,7 @@ static int match_key(struct udev_rules *rules, struct token *token, const char *
                                        pos[0] = '\0';
                                        pos = &pos[1];
                                }
-                               dbg(rules->udev, "match %s '%s' <-> '%s'\n", key_name, key_value, val);
+                               dbg(rules->udev, "match %s '%s' <-> '%s'\n", token_str[token->type], key_value, val);
                                match = (fnmatch(key_value, val, 0) == 0);
                                if (match)
                                        break;
@@ -1771,27 +1779,31 @@ static int match_key(struct udev_rules *rules, struct token *token, const char *
        }
 
        if (match && (token->key.op == OP_MATCH)) {
-               dbg(rules->udev, "%s is true (matching value)\n", key_name);
+               dbg(rules->udev, "%s is true (matching value)\n", token_str[token->type]);
                return 0;
        }
        if (!match && (token->key.op == OP_NOMATCH)) {
-               dbg(rules->udev, "%s is true (non-matching value)\n", key_name);
+               dbg(rules->udev, "%s is true (non-matching value)\n", token_str[token->type]);
                return 0;
        }
-       dbg(rules->udev, "%s is not true\n", key_name);
+       dbg(rules->udev, "%s is not true\n", token_str[token->type]);
        return -1;
 }
 
 static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct udev_event *event, struct token *cur)
 {
-       char attr[UTIL_PATH_SIZE];
        const char *key_name = &rules->buf[cur->key.attr_off];
        const char *key_value = &rules->buf[cur->key.value_off];
-       char value[UTIL_NAME_SIZE] = "";
+       char value[UTIL_NAME_SIZE];
        size_t len;
 
-       util_strlcpy(attr, key_name, sizeof(attr));
-       util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1);
+       value[0] = '\0';
+       if (key_name[0] == '[') {
+               char attr[UTIL_PATH_SIZE];
+
+               util_strlcpy(attr, key_name, sizeof(attr));
+               util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1);
+       }
        if (value[0] == '\0') {
                const char *val;
 
@@ -1799,7 +1811,7 @@ static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct
                if (val != NULL)
                        util_strlcpy(value, val, sizeof(value));
        }
-       if (value[0]=='\0')
+       if (value[0] == '\0')
                return -1;
 
        /* strip trailing whitespace of value, if not asked to match for it */
@@ -1823,6 +1835,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 {
        struct token *cur;
        struct token *rule;
+       enum escape_type esc = ESCAPE_UNSET;
 
        if (rules->tokens == NULL)
                return -1;
@@ -1831,7 +1844,6 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
        cur = &rules->tokens[0];
        rule = cur;
        while (cur != NULL && cur->type != TK_END) {
-               enum escape_type esc = ESCAPE_UNSET;
                unsigned int idx;
 
                dump_token(rules, cur);