X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-rules.c;h=2746bd551e80de6d373a680069ff7e60b9c3946d;hb=ac218d9cc8344755654f6be34f8c60863fe2fb33;hp=b19edc5ed68c03fc7e5981628d4e5d2e0f15dea2;hpb=154a7b8428731fb90cc639439fcdb98003471298;p=elogind.git diff --git a/udev/udev-rules.c b/udev/udev-rules.c index b19edc5ed..2746bd551 100644 --- a/udev/udev-rules.c +++ b/udev/udev-rules.c @@ -32,26 +32,50 @@ #define PREALLOC_STRBUF 32 * 1024 /* KEY=="", KEY!="", KEY+="", KEY="", KEY:="" */ -enum key_operation { - KEY_OP_UNSET, - KEY_OP_MATCH, - KEY_OP_NOMATCH, - KEY_OP_ADD, - KEY_OP_ASSIGN, - KEY_OP_ASSIGN_FINAL, +enum operation_type { + OP_UNSET, + + OP_MATCH, + OP_NOMATCH, + OP_MATCH_MAX, + + OP_ADD, + OP_ASSIGN, + OP_ASSIGN_FINAL, }; static const char *operation_str[] = { - [KEY_OP_MATCH] = "match", - [KEY_OP_NOMATCH] = "nomatch", - [KEY_OP_ADD] = "add", - [KEY_OP_ASSIGN] = "assign", - [KEY_OP_ASSIGN_FINAL] = "assign-final", + [OP_UNSET] = "UNSET", + [OP_MATCH] = "match", + [OP_NOMATCH] = "nomatch", + [OP_MATCH_MAX] = "MATCH_MAX", + + [OP_ADD] = "add", + [OP_ASSIGN] = "assign", + [OP_ASSIGN_FINAL] = "assign-final", +}; + +enum string_glob_type { + GL_UNSET, + GL_PLAIN, + GL_GLOB, + GL_SPLIT, + GL_SPLIT_GLOB, + GL_FORMAT, +}; + +static const char *string_glob_str[] = { + [GL_UNSET] = "UNSET", + [GL_PLAIN] = "plain", + [GL_GLOB] = "glob", + [GL_SPLIT] = "split", + [GL_SPLIT_GLOB] = "split-glob", + [GL_FORMAT] = "format", }; /* tokens of a rule are sorted/handled in this order */ enum token_type { - TK_UNDEF, + TK_UNSET, TK_RULE, TK_M_ACTION, /* val */ @@ -69,7 +93,7 @@ enum token_type { TK_M_SUBSYSTEMS, /* val */ TK_M_DRIVERS, /* val */ TK_M_ATTRS, /* val, attr */ - TK_PARENTS_MAX, + TK_M_PARENTS_MAX, TK_M_TEST, /* val, mode_t */ TK_M_PROGRAM, /* val */ @@ -77,6 +101,7 @@ enum token_type { TK_M_IMPORT_PROG, /* val */ TK_M_IMPORT_PARENT, /* val */ TK_M_RESULT, /* val */ + TK_M_MAX, TK_A_IGNORE_DEVICE, TK_A_STRING_ESCAPE_NONE, @@ -103,7 +128,7 @@ enum token_type { }; static const char *token_str[] = { - [TK_UNDEF] = "UNDEF", + [TK_UNSET] = "UNSET", [TK_RULE] = "RULE", [TK_M_ACTION] = "M ACTION", @@ -121,7 +146,7 @@ static const char *token_str[] = { [TK_M_SUBSYSTEMS] = "M SUBSYSTEMS", [TK_M_DRIVERS] = "M DRIVERS", [TK_M_ATTRS] = "M ATTRS", - [TK_PARENTS_MAX] = "PARENTS_MAX", + [TK_M_PARENTS_MAX] = "M PARENTS_MAX", [TK_M_TEST] = "M TEST", [TK_M_PROGRAM] = "M PROGRAM", @@ -129,6 +154,7 @@ static const char *token_str[] = { [TK_M_IMPORT_PROG] = "M IMPORT_PROG", [TK_M_IMPORT_PARENT] = "M MPORT_PARENT", [TK_M_RESULT] = "M RESULT", + [TK_M_MAX] = "M MAX", [TK_A_IGNORE_DEVICE] = "A IGNORE_DEVICE", [TK_A_STRING_ESCAPE_NONE] = "A STRING_ESCAPE_NONE", @@ -163,7 +189,8 @@ struct token { unsigned int filename_off; } rule; struct { - enum key_operation op; + unsigned short op; + unsigned short glob; unsigned int value_off; union { unsigned int attr_off; @@ -334,7 +361,7 @@ static gid_t add_gid(struct udev_rules *rules, const char *group) off = rules->gids[i].name_off; if (strcmp(&rules->buf[off], group) == 0) { gid = rules->gids[i].gid; - info(rules->udev, "return existing %u for '%s'\n", gid, group); + dbg(rules->udev, "return existing %u for '%s'\n", gid, group); return gid; } } @@ -588,7 +615,7 @@ static int attr_subst_subdir(char *attr, size_t len) return found; } -static int get_key(struct udev *udev, char **line, char **key, enum key_operation *op, char **value) +static int get_key(struct udev *udev, char **line, char **key, enum operation_type *op, char **value) { char *linepos; char *temp; @@ -630,19 +657,19 @@ static int get_key(struct udev *udev, char **line, char **key, enum key_operatio /* get operation type */ if (linepos[0] == '=' && linepos[1] == '=') { - *op = KEY_OP_MATCH; + *op = OP_MATCH; linepos += 2; } else if (linepos[0] == '!' && linepos[1] == '=') { - *op = KEY_OP_NOMATCH; + *op = OP_NOMATCH; linepos += 2; } else if (linepos[0] == '+' && linepos[1] == '=') { - *op = KEY_OP_ADD; + *op = OP_ADD; linepos += 2; } else if (linepos[0] == '=') { - *op = KEY_OP_ASSIGN; + *op = OP_ASSIGN; linepos++; } else if (linepos[0] == ':' && linepos[1] == '=') { - *op = KEY_OP_ASSIGN_FINAL; + *op = OP_ASSIGN_FINAL; linepos += 2; } else return -1; @@ -656,13 +683,14 @@ static int get_key(struct udev *udev, char **line, char **key, enum key_operatio if (linepos[0] == '\0') return -1; - /* get the value*/ + /* get the value */ if (linepos[0] == '"') linepos++; else return -1; *value = linepos; + /* terminate */ temp = strchr(linepos, '"'); if (!temp) return -1; @@ -697,12 +725,14 @@ static char *get_key_attribute(struct udev *udev, char *str) } static int rule_add_token(struct rule_tmp *rule_tmp, enum token_type type, - enum key_operation op, + enum operation_type op, const char *value, const void *data) { struct token *token = &rule_tmp->token[rule_tmp->token_cur]; const char *attr = data; - mode_t mode = 0000; + enum string_glob_type glob; + + memset(token, 0x00, sizeof(struct token)); switch (type) { case TK_M_ACTION: @@ -738,10 +768,9 @@ static int rule_add_token(struct rule_tmp *rule_tmp, enum token_type type, token->key.attr_off = add_string(rule_tmp->rules, attr); break; case TK_M_TEST: - if (data != NULL) - mode = *(mode_t *)data; token->key.value_off = add_string(rule_tmp->rules, value); - token->key.mode = mode; + if (data != NULL) + token->key.mode = *(mode_t *)data; break; case TK_A_IGNORE_DEVICE: case TK_A_STRING_ESCAPE_NONE: @@ -772,14 +801,40 @@ static int rule_add_token(struct rule_tmp *rule_tmp, enum token_type type, token->key.event_timeout = *(int *)data; break; case TK_RULE: - case TK_PARENTS_MAX: + case TK_M_PARENTS_MAX: + case TK_M_MAX: case TK_END: - case TK_UNDEF: + case TK_UNSET: err(rule_tmp->rules->udev, "wrong type %u\n", type); return -1; } + + glob = GL_PLAIN; + if (value != NULL) { + if (type < TK_M_MAX) { + /* check if we need to split or call fnmatch() while matching rules */ + int has_split = 0; + int has_glob = 0; + + has_split = (strchr(value, '|') != NULL); + has_glob = (strchr(value, '*') != NULL || strchr(value, '?') != NULL || + strchr(value, '[') != NULL || strchr(value, ']') != NULL); + if (has_split && has_glob) + glob = GL_SPLIT_GLOB; + else if (has_split) + glob = GL_SPLIT; + else if (has_glob) + glob = GL_GLOB; + } else { + /* check if we need to substitute format strings for matching rules */ + if (strchr(value, '%') != NULL || strchr(value, '$') != NULL) + glob = GL_FORMAT; + } + } + token->type = type; token->key.op = op; + token->key.glob = glob; rule_tmp->token_cur++; if (rule_tmp->token_cur >= ARRAY_SIZE(rule_tmp->token)) { err(rule_tmp->rules->udev, "temporary rule array too small\n"); @@ -792,7 +847,8 @@ static int rule_add_token(struct rule_tmp *rule_tmp, enum token_type type, static void dump_token(struct udev_rules *rules, struct token *token) { enum token_type type = token->type; - enum key_operation op = token->key.op; + enum operation_type op = token->key.op; + enum string_glob_type glob = token->key.glob; const char *value = &rules->buf[token->key.value_off]; const char *attr = &rules->buf[token->key.attr_off]; @@ -832,14 +888,16 @@ static void dump_token(struct udev_rules *rules, struct token *token) case TK_A_GROUP: case TK_A_MODE: case TK_A_RUN: - dbg(rules->udev, "%s %s '%s'\n", token_str[type], operation_str[op], value); + dbg(rules->udev, "%s %s '%s'(%s)\n", + token_str[type], operation_str[op], value, string_glob_str[glob]); break; case TK_M_ATTR: case TK_M_ATTRS: case TK_M_ENV: case TK_A_ATTR: case TK_A_ENV: - dbg(rules->udev, "%s %s '%s' '%s'\n", token_str[type], operation_str[op], attr, value); + dbg(rules->udev, "%s %s '%s' '%s'(%s)\n", + token_str[type], operation_str[op], attr, value, string_glob_str[glob]); break; case TK_A_IGNORE_DEVICE: case TK_A_STRING_ESCAPE_NONE: @@ -849,7 +907,8 @@ static void dump_token(struct udev_rules *rules, struct token *token) dbg(rules->udev, "%s\n", token_str[type]); break; case TK_M_TEST: - dbg(rules->udev, "%s %s '%s' %#o\n", token_str[type], operation_str[op], value, token->key.mode); + dbg(rules->udev, "%s %s '%s'(%s) %#o\n", + token_str[type], operation_str[op], value, string_glob_str[glob], token->key.mode); break; case TK_A_NUM_FAKE_PART: dbg(rules->udev, "%s %u\n", token_str[type], token->key.num_fake_part); @@ -875,8 +934,8 @@ static void dump_token(struct udev_rules *rules, struct token *token) case TK_END: dbg(rules->udev, "* %s\n", token_str[type]); break; - case TK_PARENTS_MAX: - case TK_UNDEF: + case TK_M_PARENTS_MAX: + case TK_UNSET: dbg(rules->udev, "unknown type %u\n", type); break; } @@ -906,15 +965,15 @@ static int sort_token(struct udev_rules *rules, struct rule_tmp *rule_tmp) unsigned int end = rule_tmp->token_cur; for (i = 0; i < rule_tmp->token_cur; i++) { - enum token_type next_val = TK_UNDEF; + enum token_type next_val = TK_UNSET; unsigned int next_idx; unsigned int j; /* find smallest value */ for (j = start; j < end; j++) { - if (rule_tmp->token[j].type == TK_UNDEF) + if (rule_tmp->token[j].type == TK_UNSET) continue; - if (next_val == TK_UNDEF || rule_tmp->token[j].type < next_val) { + if (next_val == TK_UNSET || rule_tmp->token[j].type < next_val) { next_val = rule_tmp->token[j].type; next_idx = j; } @@ -923,7 +982,7 @@ static int sort_token(struct udev_rules *rules, struct rule_tmp *rule_tmp) /* add token and mark done */ if (add_token(rules, &rule_tmp->token[next_idx]) != 0) return -1; - rule_tmp->token[next_idx].type = TK_UNDEF; + rule_tmp->token[next_idx].type = TK_UNSET; /* shrink range */ if (next_idx == start) @@ -952,13 +1011,13 @@ static int add_rule(struct udev_rules *rules, char *line, while (1) { char *key; char *value; - enum key_operation op = KEY_OP_UNSET; + enum operation_type op; if (get_key(rules->udev, &linepos, &key, &op, &value) != 0) break; if (strcasecmp(key, "ACTION") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid ACTION operation\n"); goto invalid; } @@ -968,7 +1027,7 @@ static int add_rule(struct udev_rules *rules, char *line, } if (strcasecmp(key, "DEVPATH") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid DEVPATH operation\n"); goto invalid; } @@ -978,7 +1037,7 @@ static int add_rule(struct udev_rules *rules, char *line, } if (strcasecmp(key, "KERNEL") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid KERNEL operation\n"); goto invalid; } @@ -988,7 +1047,7 @@ static int add_rule(struct udev_rules *rules, char *line, } if (strcasecmp(key, "SUBSYSTEM") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid SUBSYSTEM operation\n"); goto invalid; } @@ -1007,7 +1066,7 @@ static int add_rule(struct udev_rules *rules, char *line, } if (strcasecmp(key, "DRIVER") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid DRIVER operation\n"); goto invalid; } @@ -1022,7 +1081,7 @@ static int add_rule(struct udev_rules *rules, char *line, err(rules->udev, "error parsing ATTR attribute\n"); goto invalid; } - if (op == KEY_OP_MATCH || op == KEY_OP_NOMATCH) { + if (op < OP_MATCH_MAX) { rule_add_token(&rule_tmp, TK_M_ATTR, op, value, attr); } else { rule_add_token(&rule_tmp, TK_A_ATTR, op, value, attr); @@ -1033,7 +1092,7 @@ static int add_rule(struct udev_rules *rules, char *line, if (strcasecmp(key, "KERNELS") == 0 || strcasecmp(key, "ID") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid KERNELS operation\n"); goto invalid; } @@ -1044,7 +1103,7 @@ static int add_rule(struct udev_rules *rules, char *line, if (strcasecmp(key, "SUBSYSTEMS") == 0 || strcasecmp(key, "BUS") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid SUBSYSTEMS operation\n"); goto invalid; } @@ -1054,7 +1113,7 @@ static int add_rule(struct udev_rules *rules, char *line, } if (strcasecmp(key, "DRIVERS") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid DRIVERS operation\n"); goto invalid; } @@ -1065,7 +1124,7 @@ static int add_rule(struct udev_rules *rules, char *line, if (strncasecmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 || strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid ATTRS operation\n"); goto invalid; } @@ -1093,7 +1152,7 @@ static int add_rule(struct udev_rules *rules, char *line, } if (strncmp(attr, "PHYSDEV", 7) == 0) physdev = 1; - if (op == KEY_OP_MATCH || op == KEY_OP_NOMATCH) { + if (op < OP_MATCH_MAX) { if (rule_add_token(&rule_tmp, TK_M_ENV, op, value, attr) != 0) goto invalid; } else { @@ -1111,7 +1170,7 @@ static int add_rule(struct udev_rules *rules, char *line, } if (strcasecmp(key, "RESULT") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid RESULT operation\n"); goto invalid; } @@ -1171,7 +1230,7 @@ static int add_rule(struct udev_rules *rules, char *line, if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) { mode_t mode = 0; - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid TEST operation\n"); goto invalid; } @@ -1216,7 +1275,7 @@ static int add_rule(struct udev_rules *rules, char *line, } if (strncasecmp(key, "NAME", sizeof("NAME")-1) == 0) { - if (op == KEY_OP_MATCH || op == KEY_OP_NOMATCH) { + if (op < OP_MATCH_MAX) { rule_add_token(&rule_tmp, TK_M_NAME, op, value, NULL); } else { if (value[0] == '\0') @@ -1240,13 +1299,13 @@ static int add_rule(struct udev_rules *rules, char *line, } if (strcasecmp(key, "SYMLINK") == 0) { - if (op == KEY_OP_MATCH || op == KEY_OP_NOMATCH) - rule_add_token(&rule_tmp, TK_M_DEVLINK, op, value, NULL); - else - rule_add_token(&rule_tmp, TK_A_DEVLINK, op, value, NULL); - valid = 1; - continue; - } + if (op < OP_MATCH_MAX) + rule_add_token(&rule_tmp, TK_M_DEVLINK, op, value, NULL); + else + rule_add_token(&rule_tmp, TK_A_DEVLINK, op, value, NULL); + valid = 1; + continue; + } if (strcasecmp(key, "OWNER") == 0) { uid_t uid; @@ -1650,33 +1709,63 @@ static int match_key(struct udev_rules *rules, struct token *token, const char * if (val == NULL) val = ""; - /* look for a matching string, parts are separated by '|' */ - if (strchr(key_value, '|') != NULL) { - char value[UTIL_PATH_SIZE]; + switch (token->key.glob) { + case GL_PLAIN: + match = (strcmp(key_value, val) == 0); + break; + case GL_GLOB: + match = (fnmatch(key_value, val, 0) == 0); + break; + case GL_SPLIT: + { + char value[UTIL_PATH_SIZE]; - 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]; + 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) + break; + key_value = pos; } - dbg(rules->udev, "match %s '%s' <-> '%s'\n", key_name, key_value, val); - match = (fnmatch(key_value, val, 0) == 0); - if (match) - break; - key_value = pos; + break; } - } else { - match = (fnmatch(key_value, val, 0) == 0); + case GL_SPLIT_GLOB: + { + char value[UTIL_PATH_SIZE]; + + 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 = (fnmatch(key_value, val, 0) == 0); + if (match) + break; + key_value = pos; + } + break; + } + case GL_FORMAT: + case GL_UNSET: + return -1; } - if (match && (token->key.op == KEY_OP_MATCH)) { + if (match && (token->key.op == OP_MATCH)) { dbg(rules->udev, "%s is true (matching value)\n", key_name); return 0; } - if (!match && (token->key.op == KEY_OP_NOMATCH)) { + if (!match && (token->key.op == OP_NOMATCH)) { dbg(rules->udev, "%s is true (non-matching value)\n", key_name); return 0; } @@ -1811,7 +1900,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event util_strlcpy(filename, &rules->buf[cur->key.value_off], sizeof(filename)); udev_event_apply_format(event, filename, sizeof(filename)); found = (wait_for_file(event->dev, filename, 10) == 0); - if (!found && (cur->key.op != KEY_OP_NOMATCH)) + if (!found && (cur->key.op != OP_NOMATCH)) goto nomatch; break; } @@ -1828,7 +1917,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event /* get whole sequence of parent matches */ next = cur; - while (next->type < TK_PARENTS_MAX) + while (next->type < TK_M_PARENTS_MAX) next++; /* loop over parents */ @@ -1902,9 +1991,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event info(event->udev, "'%s' has mode=%#o and %s %#o\n", filename, statbuf.st_mode, match ? "matches" : "does not match", cur->key.mode); } - if (match && cur->key.op == KEY_OP_NOMATCH) + if (match && cur->key.op == OP_NOMATCH) goto nomatch; - if (!match && cur->key.op == KEY_OP_MATCH) + if (!match && cur->key.op == OP_MATCH) goto nomatch; break; } @@ -1920,7 +2009,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event udev_event_apply_format(event, program, sizeof(program)); envp = udev_device_get_properties_envp(event->dev); if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL) != 0) { - if (cur->key.op != KEY_OP_NOMATCH) + if (cur->key.op != OP_NOMATCH) goto nomatch; } else { int count; @@ -1933,7 +2022,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event } event->program_result = strdup(result); dbg(event->udev, "storing result '%s'\n", event->program_result); - if (cur->key.op == KEY_OP_NOMATCH) + if (cur->key.op == OP_NOMATCH) goto nomatch; } break; @@ -1945,7 +2034,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import)); udev_event_apply_format(event, import, sizeof(import)); if (import_file_into_properties(event->dev, import) != 0) - if (cur->key.op != KEY_OP_NOMATCH) + if (cur->key.op != OP_NOMATCH) goto nomatch; break; } @@ -1956,7 +2045,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import)); udev_event_apply_format(event, import, sizeof(import)); if (import_program_into_properties(event->dev, import) != 0) - if (cur->key.op != KEY_OP_NOMATCH) + if (cur->key.op != OP_NOMATCH) goto nomatch; break; } @@ -1967,7 +2056,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import)); udev_event_apply_format(event, import, sizeof(import)); if (import_parent_into_properties(event->dev, import) != 0) - if (cur->key.op != KEY_OP_NOMATCH) + if (cur->key.op != OP_NOMATCH) goto nomatch; break; } @@ -2002,7 +2091,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (event->owner_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->owner_final = 1; util_strlcpy(owner, &rules->buf[cur->key.value_off], sizeof(owner)); udev_event_apply_format(event, owner, sizeof(owner)); @@ -2015,7 +2104,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (event->group_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->group_final = 1; util_strlcpy(group, &rules->buf[cur->key.value_off], sizeof(group)); udev_event_apply_format(event, group, sizeof(group)); @@ -2029,7 +2118,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (event->mode_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->mode_final = 1; util_strlcpy(mode, &rules->buf[cur->key.value_off], sizeof(mode)); udev_event_apply_format(event, mode, sizeof(mode)); @@ -2043,21 +2132,21 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event case TK_A_OWNER_ID: if (event->owner_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->owner_final = 1; event->uid = cur->key.uid; break; case TK_A_GROUP_ID: if (event->group_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->group_final = 1; event->gid = cur->key.gid; break; case TK_A_MODE_ID: if (event->mode_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->mode_final = 1; event->mode = cur->key.mode; break; @@ -2088,7 +2177,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (event->name_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->name_final = 1; if (name[0] == '\0') { free(event->name); @@ -2117,9 +2206,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event break; if (major(udev_device_get_devnum(event->dev)) == 0) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->devlink_final = 1; - if (cur->key.op == KEY_OP_ASSIGN || cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL) udev_device_cleanup_devlinks_list(event->dev); /* allow multiple symlinks separated by spaces */ @@ -2197,7 +2286,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event { struct udev_list_entry *list_entry; - if (cur->key.op == KEY_OP_ASSIGN || cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL) udev_list_cleanup_entries(event->udev, &event->run_list); list_entry = udev_list_entry_add(event->udev, &event->run_list, &rules->buf[cur->key.value_off], NULL, 1, 0); @@ -2211,9 +2300,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event case TK_A_LAST_RULE: break; - case TK_PARENTS_MAX: + case TK_M_PARENTS_MAX: + case TK_M_MAX: case TK_END: - case TK_UNDEF: + case TK_UNSET: err(rules->udev, "wrong type %u\n", cur->type); goto nomatch; }