use fnmatch() instead of our own pattern match code

[elogind.git] / udev_rules_parse.c

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 5e93e60d4f97f906cc216f522cbed3b9aac3cdb7..5603ee1d11fa83a26578e09ed2a521dd9c7882fa 100644 (file)
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -219,7 +219,7 @@ static int add_rule_key_pair(struct udev_rule *rule, struct key_pairs *pairs,
        size_t key_len = strnlen(key, PATH_SIZE);
 
        if (pairs->count >= PAIRS_MAX) {
-               err("skip, too many keys in a single rule");
+               err("skip, too many keys of the same type in a single rule");
                return -1;
        }
 
@@ -321,18 +321,14 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                        continue;
                }
 
-               if (strncasecmp(key, "ATTR", sizeof("ATTR")-1) == 0) {
-                       if (operation != KEY_OP_MATCH &&
-                           operation != KEY_OP_NOMATCH) {
-                               err("invalid ATTR operation");
-                               goto invalid;
-                       }
+               if (strncasecmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
                        attr = get_key_attribute(key + sizeof("ATTR")-1);
                        if (attr == NULL) {
-                               err("error parsing ATTR attribute in '%s'", line);
-                               continue;
+                               err("error parsing ATTR attribute");
+                               goto invalid;
                        }
-                       add_rule_key_pair(rule, &rule->attr, operation, attr, value);
+                       if (add_rule_key_pair(rule, &rule->attr, operation, attr, value) != 0)
+                               goto invalid;
                        valid = 1;
                        continue;
                }
@@ -349,7 +345,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                        continue;
                }
 
-               if (strcasecmp(key, "SUBSYTEMS") == 0 ||
+               if (strcasecmp(key, "SUBSYSTEMS") == 0 ||
                    strcasecmp(key, "BUS") == 0) {
                        if (operation != KEY_OP_MATCH &&
                            operation != KEY_OP_NOMATCH) {
@@ -372,30 +368,27 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                        continue;
                }
 
-               if (strncasecmp(key, "ATTRS", sizeof("ATTRS")-1) == 0 ||
-                   strncasecmp(key, "SYSFS", sizeof("SYSFS")-1) == 0) {
-                       if (operation != KEY_OP_MATCH &&
-                           operation != KEY_OP_NOMATCH) {
-                               err("invalid ATTRSS operation");
-                               goto invalid;
-                       }
+               if (strncasecmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 ||
+                   strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
                        attr = get_key_attribute(key + sizeof("ATTRS")-1);
                        if (attr == NULL) {
-                               err("error parsing ATTRS attribute in '%s'", line);
-                               continue;
+                               err("error parsing ATTRS attribute");
+                               goto invalid;
                        }
-                       add_rule_key_pair(rule, &rule->attrs, operation, attr, value);
+                       if (add_rule_key_pair(rule, &rule->attrs, operation, attr, value) != 0)
+                               goto invalid;
                        valid = 1;
                        continue;
                }
 
-               if (strncasecmp(key, "ENV", sizeof("ENV")-1) == 0) {
+               if (strncasecmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
                        attr = get_key_attribute(key + sizeof("ENV")-1);
                        if (attr == NULL) {
                                err("error parsing ENV attribute");
-                               continue;
+                               goto invalid;
                        }
-                       add_rule_key_pair(rule, &rule->env, operation, attr, value);
+                       if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
+                               goto invalid;
                        valid = 1;
                        continue;
                }