X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-rules.c;h=eb73221fa9026135847b9d60353bce30bf6fdf8d;hb=6d80a7e83f55c7319d1cb9b0a9910a005b2f4103;hp=5cb381ebac68f561e7b2c1372042edd1ca2b2c0f;hpb=32028733ee9ee1fca2f18497ff302de003916c4f;p=elogind.git diff --git a/udev/udev-rules.c b/udev/udev-rules.c index 5cb381eba..eb73221fa 100644 --- a/udev/udev-rules.c +++ b/udev/udev-rules.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2009 Kay Sievers + * Copyright (C) 2003-2010 Kay Sievers * Copyright (C) 2008 Alan Jenkins * * This program is free software: you can redistribute it and/or modify @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -27,6 +28,7 @@ #include #include #include +#include #include "udev.h" @@ -123,6 +125,7 @@ enum token_type { TK_M_DEVLINK, /* val */ TK_M_NAME, /* val */ TK_M_ENV, /* val, attr */ + TK_M_TAG, /* val */ TK_M_SUBSYSTEM, /* val */ TK_M_DRIVER, /* val */ TK_M_WAITFOR, /* val */ @@ -139,15 +142,14 @@ enum token_type { TK_M_PROGRAM, /* val */ TK_M_IMPORT_FILE, /* val */ TK_M_IMPORT_PROG, /* val */ + TK_M_IMPORT_DB, /* val */ TK_M_IMPORT_PARENT, /* val */ TK_M_RESULT, /* val */ TK_M_MAX, - TK_A_IGNORE_DEVICE, TK_A_STRING_ESCAPE_NONE, TK_A_STRING_ESCAPE_REPLACE, TK_A_INOTIFY_WATCH, /* int */ - TK_A_NUM_FAKE_PART, /* int */ TK_A_DEVLINK_PRIO, /* int */ TK_A_OWNER, /* val */ TK_A_GROUP, /* val */ @@ -156,14 +158,13 @@ enum token_type { TK_A_GROUP_ID, /* gid_t */ TK_A_MODE_ID, /* mode_t */ TK_A_ENV, /* val, attr */ + TK_A_TAG, /* val */ TK_A_NAME, /* val */ TK_A_DEVLINK, /* val */ TK_A_EVENT_TIMEOUT, /* int */ - TK_A_IGNORE_REMOVE, TK_A_ATTR, /* val, attr */ TK_A_RUN, /* val, bool */ TK_A_GOTO, /* size_t */ - TK_A_LAST_RULE, TK_END, }; @@ -189,12 +190,12 @@ struct token { unsigned int value_off; union { unsigned int attr_off; - int ignore_error; + int devlink_unique; + int fail_on_error; unsigned int rule_goto; mode_t mode; uid_t uid; gid_t gid; - int num_fake_part; int devlink_prio; int event_timeout; int watch; @@ -211,7 +212,7 @@ struct rule_tmp { unsigned int token_cur; }; -#ifdef DEBUG +#ifdef ENABLE_DEBUG static const char *operation_str(enum operation_type type) { static const char *operation_strs[] = { @@ -254,6 +255,7 @@ static const char *token_str(enum token_type type) [TK_M_DEVLINK] = "M DEVLINK", [TK_M_NAME] = "M NAME", [TK_M_ENV] = "M ENV", + [TK_M_TAG] = "M TAG", [TK_M_SUBSYSTEM] = "M SUBSYSTEM", [TK_M_DRIVER] = "M DRIVER", [TK_M_WAITFOR] = "M WAITFOR", @@ -270,15 +272,14 @@ static const char *token_str(enum token_type type) [TK_M_PROGRAM] = "M PROGRAM", [TK_M_IMPORT_FILE] = "M IMPORT_FILE", [TK_M_IMPORT_PROG] = "M IMPORT_PROG", - [TK_M_IMPORT_PARENT] = "M MPORT_PARENT", + [TK_M_IMPORT_DB] = "M IMPORT_DB", + [TK_M_IMPORT_PARENT] = "M IMPORT_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", [TK_A_STRING_ESCAPE_REPLACE] = "A STRING_ESCAPE_REPLACE", [TK_A_INOTIFY_WATCH] = "A INOTIFY_WATCH", - [TK_A_NUM_FAKE_PART] = "A NUM_FAKE_PART", [TK_A_DEVLINK_PRIO] = "A DEVLINK_PRIO", [TK_A_OWNER] = "A OWNER", [TK_A_GROUP] = "A GROUP", @@ -287,14 +288,13 @@ static const char *token_str(enum token_type type) [TK_A_GROUP_ID] = "A GROUP_ID", [TK_A_MODE_ID] = "A MODE_ID", [TK_A_ENV] = "A ENV", + [TK_A_TAG] = "A ENV", [TK_A_NAME] = "A NAME", [TK_A_DEVLINK] = "A DEVLINK", [TK_A_EVENT_TIMEOUT] = "A EVENT_TIMEOUT", - [TK_A_IGNORE_REMOVE] = "A IGNORE_REMOVE", [TK_A_ATTR] = "A ATTR", [TK_A_RUN] = "A RUN", [TK_A_GOTO] = "A GOTO", - [TK_A_LAST_RULE] = "A LAST_RULE", [TK_END] = "END", }; @@ -338,6 +338,7 @@ static void dump_token(struct udev_rules *rules, struct token *token) case TK_M_PROGRAM: case TK_M_IMPORT_FILE: case TK_M_IMPORT_PROG: + case TK_M_IMPORT_DB: case TK_M_IMPORT_PARENT: case TK_M_RESULT: case TK_A_NAME: @@ -357,11 +358,12 @@ static void dump_token(struct udev_rules *rules, struct token *token) 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_M_TAG: + case TK_A_TAG: + dbg(rules->udev, "%s %s '%s'\n", token_str(type), operation_str(op), value); + break; case TK_A_STRING_ESCAPE_NONE: case TK_A_STRING_ESCAPE_REPLACE: - case TK_A_LAST_RULE: - case TK_A_IGNORE_REMOVE: dbg(rules->udev, "%s\n", token_str(type)); break; case TK_M_TEST: @@ -371,9 +373,6 @@ static void dump_token(struct udev_rules *rules, struct token *token) case TK_A_INOTIFY_WATCH: dbg(rules->udev, "%s %u\n", token_str(type), token->key.watch); break; - case TK_A_NUM_FAKE_PART: - dbg(rules->udev, "%s %u\n", token_str(type), token->key.num_fake_part); - break; case TK_A_DEVLINK_PRIO: dbg(rules->udev, "%s %s %u\n", token_str(type), operation_str(op), token->key.devlink_prio); break; @@ -421,7 +420,7 @@ static inline const char *operation_str(enum operation_type type) { return NULL; static inline const char *token_str(enum token_type type) { return NULL; } static inline void dump_token(struct udev_rules *rules, struct token *token) {} static inline void dump_rules(struct udev_rules *rules) {} -#endif /* DEBUG */ +#endif /* ENABLE_DEBUG */ static int add_new_string(struct udev_rules *rules, const char *str, size_t bytes) { @@ -718,8 +717,9 @@ static int import_property_from_string(struct udev_device *dev, char *line) struct udev_list_entry *entry; entry = udev_device_add_property(dev, key, val); - /* store in db */ - udev_list_entry_set_flag(entry, 1); + /* store in db, skip private keys */ + if (key[0] != '.') + udev_list_entry_set_flags(entry, 1); } return 0; } @@ -747,7 +747,7 @@ static int import_program_into_properties(struct udev_device *dev, const char *p char *line; envp = udev_device_get_properties_envp(dev); - if (util_run_program(udev, program, envp, result, sizeof(result), &reslen) != 0) + if (util_run_program(udev, program, envp, result, sizeof(result), &reslen, NULL) != 0) return -1; line = result; @@ -785,8 +785,9 @@ static int import_parent_into_properties(struct udev_device *dev, const char *fi dbg(udev, "import key '%s=%s'\n", key, val); entry = udev_device_add_property(dev, key, val); - /* store in db */ - udev_list_entry_set_flag(entry, 1); + /* store in db, skip private keys */ + if (key[0] != '.') + udev_list_entry_set_flags(entry, 1); } } return 0; @@ -812,6 +813,8 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout) dbg(udev, "will wait %i sec for '%s'\n", timeout, file); while (--loop) { + const struct timespec duration = { 0, 1000 * 1000 * 1000 / WAIT_LOOP_PER_SECOND }; + /* lookup file */ if (stat(file, &stats) == 0) { info(udev, "file '%s' appeared after %i loops\n", file, (timeout * WAIT_LOOP_PER_SECOND) - loop-1); @@ -823,7 +826,7 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout) return -2; } info(udev, "wait for '%s' for %i mseconds\n", file, 1000 / WAIT_LOOP_PER_SECOND); - usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND); + nanosleep(&duration, NULL); } info(udev, "waiting for '%s' failed\n", file); return -1; @@ -873,7 +876,7 @@ static int get_key(struct udev *udev, char **line, char **key, enum operation_ty char *temp; linepos = *line; - if (linepos == NULL && linepos[0] == '\0') + if (linepos == NULL || linepos[0] == '\0') return -1; /* skip whitespace */ @@ -1000,14 +1003,16 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type, case TK_M_PROGRAM: case TK_M_IMPORT_FILE: case TK_M_IMPORT_PROG: + case TK_M_IMPORT_DB: case TK_M_IMPORT_PARENT: case TK_M_RESULT: case TK_A_OWNER: case TK_A_GROUP: case TK_A_MODE: case TK_A_NAME: - case TK_A_DEVLINK: case TK_A_GOTO: + case TK_M_TAG: + case TK_A_TAG: token->key.value_off = add_string(rule_tmp->rules, value); break; case TK_M_ENV: @@ -1019,23 +1024,23 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type, token->key.value_off = add_string(rule_tmp->rules, value); token->key.attr_off = add_string(rule_tmp->rules, attr); break; + case TK_A_DEVLINK: + token->key.value_off = add_string(rule_tmp->rules, value); + token->key.devlink_unique = *(int *)data; + break; case TK_M_TEST: token->key.value_off = add_string(rule_tmp->rules, value); if (data != NULL) token->key.mode = *(mode_t *)data; break; - case TK_A_IGNORE_DEVICE: case TK_A_STRING_ESCAPE_NONE: case TK_A_STRING_ESCAPE_REPLACE: - case TK_A_IGNORE_REMOVE: - case TK_A_LAST_RULE: break; case TK_A_RUN: token->key.value_off = add_string(rule_tmp->rules, value); - token->key.ignore_error = *(int *)data; + token->key.fail_on_error = *(int *)data; break; case TK_A_INOTIFY_WATCH: - case TK_A_NUM_FAKE_PART: case TK_A_DEVLINK_PRIO: token->key.devlink_prio = *(int *)data; break; @@ -1122,7 +1127,7 @@ static int sort_token(struct udev_rules *rules, struct rule_tmp *rule_tmp) for (i = 0; i < rule_tmp->token_cur; i++) { enum token_type next_val = TK_UNSET; - unsigned int next_idx; + unsigned int next_idx = 0; unsigned int j; /* find smallest value */ @@ -1155,6 +1160,9 @@ static int add_rule(struct udev_rules *rules, char *line, char *linepos; char *attr; struct rule_tmp rule_tmp; + bool bus_warn = false; + bool sysfs_warn = false; + bool id_warn = false; memset(&rule_tmp, 0x00, sizeof(struct rule_tmp)); rule_tmp.rules = rules; @@ -1239,8 +1247,7 @@ static int add_rule(struct udev_rules *rules, char *line, continue; } - if (strcmp(key, "KERNELS") == 0 || - strcmp(key, "ID") == 0) { + if (strcmp(key, "KERNELS") == 0) { if (op > OP_MATCH_MAX) { err(rules->udev, "invalid KERNELS operation\n"); goto invalid; @@ -1249,8 +1256,37 @@ static int add_rule(struct udev_rules *rules, char *line, continue; } - if (strcmp(key, "SUBSYSTEMS") == 0 || - strcmp(key, "BUS") == 0) { + if (strcmp(key, "ID") == 0) { + if (!id_warn) { + id_warn = true; + err(rules->udev, "ID= will be removed in a future udev version, " + "please use KERNEL= to match the event device, or KERNELS= " + "to match a parent device, in %s:%u\n", filename, lineno); + } + if (op > OP_MATCH_MAX) { + err(rules->udev, "invalid KERNELS operation\n"); + goto invalid; + } + rule_add_key(&rule_tmp, TK_M_KERNELS, op, value, NULL); + continue; + } + + if (strcmp(key, "SUBSYSTEMS") == 0) { + if (op > OP_MATCH_MAX) { + err(rules->udev, "invalid SUBSYSTEMS operation\n"); + goto invalid; + } + rule_add_key(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL); + continue; + } + + if (strcmp(key, "BUS") == 0) { + if (!bus_warn) { + bus_warn = true; + err(rules->udev, "BUS= will be removed in a future udev version, " + "please use SUBSYSTEM= to match the event device, or SUBSYSTEMS= " + "to match a parent device, in %s:%u\n", filename, lineno); + } if (op > OP_MATCH_MAX) { err(rules->udev, "invalid SUBSYSTEMS operation\n"); goto invalid; @@ -1268,8 +1304,7 @@ static int add_rule(struct udev_rules *rules, char *line, continue; } - if (strncmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 || - strncmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) { + if (strncmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0) { if (op > OP_MATCH_MAX) { err(rules->udev, "invalid ATTRS operation\n"); goto invalid; @@ -1289,6 +1324,26 @@ static int add_rule(struct udev_rules *rules, char *line, continue; } + if (strncmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) { + if (!sysfs_warn) { + sysfs_warn = true; + err(rules->udev, "SYSFS{}= will be removed in a future udev version, " + "please use ATTR{}= to match the event device, or ATTRS{}= " + "to match a parent device, in %s:%u\n", filename, lineno); + } + if (op > OP_MATCH_MAX) { + err(rules->udev, "invalid ATTRS operation\n"); + goto invalid; + } + attr = get_key_attribute(rules->udev, key + sizeof("ATTRS")-1); + if (attr == NULL) { + err(rules->udev, "error parsing ATTRS attribute\n"); + goto invalid; + } + rule_add_key(&rule_tmp, TK_M_ATTRS, op, value, attr); + continue; + } + if (strncmp(key, "ENV{", sizeof("ENV{")-1) == 0) { attr = get_key_attribute(rules->udev, key + sizeof("ENV")-1); if (attr == NULL) { @@ -1305,6 +1360,14 @@ static int add_rule(struct udev_rules *rules, char *line, continue; } + if (strcmp(key, "TAG") == 0) { + if (op < OP_MATCH_MAX) + rule_add_key(&rule_tmp, TK_M_TAG, op, value, NULL); + else + rule_add_key(&rule_tmp, TK_A_TAG, op, value, NULL); + continue; + } + if (strcmp(key, "PROGRAM") == 0) { rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL); continue; @@ -1327,6 +1390,9 @@ static int add_rule(struct udev_rules *rules, char *line, } else if (attr != NULL && strstr(attr, "file")) { dbg(rules->udev, "IMPORT will be included as file\n"); rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL); + } else if (attr != NULL && strstr(attr, "db")) { + dbg(rules->udev, "IMPORT will include db values\n"); + rule_add_key(&rule_tmp, TK_M_IMPORT_DB, op, value, NULL); } else if (attr != NULL && strstr(attr, "parent")) { dbg(rules->udev, "IMPORT will include the parent values\n"); rule_add_key(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL); @@ -1338,7 +1404,7 @@ static int add_rule(struct udev_rules *rules, char *line, /* allow programs in /lib/udev called without the path */ if (value[0] != '/') - util_strscpyl(file, sizeof(file), UDEV_PREFIX "/lib/udev/", value, NULL); + util_strscpyl(file, sizeof(file), LIBEXECDIR "/", value, NULL); else util_strscpy(file, sizeof(file), value); pos = strchr(file, ' '); @@ -1377,7 +1443,7 @@ static int add_rule(struct udev_rules *rules, char *line, int flag = 0; attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1); - if (attr != NULL && strstr(attr, "ignore_error")) + if (attr != NULL && strstr(attr, "fail_event_on_error")) flag = 1; rule_add_key(&rule_tmp, TK_A_RUN, op, value, &flag); continue; @@ -1402,32 +1468,26 @@ static int add_rule(struct udev_rules *rules, char *line, if (op < OP_MATCH_MAX) { rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL); } else { - if (value[0] == '\0') - info(rules->udev, "name empty, node creation suppressed\n"); + if (strcmp(value, "%k") == 0) + err(rules->udev, "NAME=\"%%k\" is superfluous and breaks " + "kernel supplied names, please remove it from %s:%u\n", filename, lineno); rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL); - attr = get_key_attribute(rules->udev, key + sizeof("NAME")-1); - if (attr != NULL) { - if (strstr(attr, "all_partitions") != NULL) { - int num = DEFAULT_FAKE_PARTITIONS_COUNT; - - dbg(rules->udev, "creation of partition nodes requested\n"); - rule_add_key(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num); - } - if (strstr(attr, "ignore_remove") != NULL) { - dbg(rules->udev, "remove event should be ignored\n"); - rule_add_key(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL); - } - } } rule_tmp.rule.rule.flags = 1; continue; } - if (strcmp(key, "SYMLINK") == 0) { - if (op < OP_MATCH_MAX) + if (strncmp(key, "SYMLINK", sizeof("SYMLINK")-1) == 0) { + if (op < OP_MATCH_MAX) { rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL); - else - rule_add_key(&rule_tmp, TK_A_DEVLINK, op, value, NULL); + } else { + int flag = 0; + + attr = get_key_attribute(rules->udev, key + sizeof("SYMLINK")-1); + if (attr != NULL && strstr(attr, "unique") != NULL) + flag = 1; + rule_add_key(&rule_tmp, TK_A_DEVLINK, op, value, &flag); + } rule_tmp.rule.rule.flags = 1; continue; } @@ -1482,18 +1542,6 @@ static int add_rule(struct udev_rules *rules, char *line, if (strcmp(key, "OPTIONS") == 0) { const char *pos; - if (strstr(value, "last_rule") != NULL) { - dbg(rules->udev, "last rule to be applied\n"); - rule_add_key(&rule_tmp, TK_A_LAST_RULE, 0, NULL, NULL); - } - if (strstr(value, "ignore_device") != NULL) { - dbg(rules->udev, "device should be ignored\n"); - rule_add_key(&rule_tmp, TK_A_IGNORE_DEVICE, 0, NULL, NULL); - } - if (strstr(value, "ignore_remove") != NULL) { - dbg(rules->udev, "remove event should be ignored\n"); - rule_add_key(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL); - } pos = strstr(value, "link_priority="); if (pos != NULL) { int prio = atoi(&pos[strlen("link_priority=")]); @@ -1506,7 +1554,7 @@ static int add_rule(struct udev_rules *rules, char *line, int tout = atoi(&pos[strlen("event_timeout=")]); rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout); - dbg(rules->udev, "event timout=%i\n", tout); + dbg(rules->udev, "event timeout=%i\n", tout); } pos = strstr(value, "string_escape="); if (pos != NULL) { @@ -1516,12 +1564,6 @@ static int add_rule(struct udev_rules *rules, char *line, else if (strncmp(pos, "replace", strlen("replace")) == 0) rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, 0, NULL, NULL); } - if (strstr(value, "all_partitions") != NULL) { - int num = DEFAULT_FAKE_PARTITIONS_COUNT; - - rule_add_key(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num); - dbg(rules->udev, "creation of partition nodes requested\n"); - } pos = strstr(value, "nowatch"); if (pos != NULL) { const int off = 0; @@ -1573,7 +1615,7 @@ static int parse_file(struct udev_rules *rules, const char *filename, unsigned s first_token = rules->token_cur; - while(fgets(line, sizeof(line), f) != NULL) { + while (fgets(line, sizeof(line), f) != NULL) { char *key; size_t len; @@ -1595,6 +1637,8 @@ static int parse_file(struct udev_rules *rules, const char *filename, unsigned s while (line[len-2] == '\\') { if (fgets(&line[len-2], (sizeof(line)-len)+2, f) == NULL) break; + if (strlen(&line[len-2]) < 2) + break; line_nr++; len = strlen(line); } @@ -1724,17 +1768,11 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) /* read dynamic/temporary rules */ util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/rules.d", NULL); - if (stat(filename, &statbuf) != 0) { - util_create_path(udev, filename); - udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755); - mkdir(filename, 0755); - udev_selinux_resetfscreatecon(udev); - } udev_list_init(&sort_list); add_matching_files(udev, &sort_list, filename, ".rules"); /* read default rules */ - add_matching_files(udev, &sort_list, UDEV_PREFIX "/lib/udev/rules.d", ".rules"); + add_matching_files(udev, &sort_list, LIBEXECDIR "/rules.d", ".rules"); /* sort all rules files by basename into list of files */ udev_list_entry_foreach_safe(sort_loop, sort_tmp, udev_list_get_entry(&sort_list)) { @@ -1782,18 +1820,18 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) filename_off = add_string(rules, filename); /* the offset in the rule is limited to unsigned short */ if (filename_off < USHRT_MAX) - udev_list_entry_set_flag(file_loop, filename_off); + udev_list_entry_set_flags(file_loop, filename_off); } /* parse list of files */ udev_list_entry_foreach_safe(file_loop, file_tmp, udev_list_get_entry(&file_list)) { const char *filename = udev_list_entry_get_name(file_loop); - unsigned int filename_off = udev_list_entry_get_flag(file_loop); + unsigned int filename_off = udev_list_entry_get_flags(file_loop); if (stat(filename, &statbuf) == 0 && statbuf.st_size > 0) parse_file(rules, filename, filename_off); else - info(udev, "can not read '%s'\n", filename); + err(udev, "can not read '%s'\n", filename); udev_list_entry_delete(file_loop); } @@ -1999,13 +2037,12 @@ 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; - int can_set_name; + bool can_set_name; if (rules->tokens == NULL) return -1; - can_set_name = ((strcmp(udev_device_get_action(event->dev), "add") == 0 || - strcmp(udev_device_get_action(event->dev), "change") == 0) && + can_set_name = ((strcmp(udev_device_get_action(event->dev), "remove") != 0) && (major(udev_device_get_devnum(event->dev)) > 0 || strcmp(udev_device_get_subsystem(event->dev), "net") == 0)); @@ -2072,6 +2109,21 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event goto nomatch; break; } + case TK_M_TAG: + { + struct udev_list_entry *list_entry; + bool match = false; + + udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(event->dev)) { + if (strcmp(&rules->buf[cur->key.value_off], udev_list_entry_get_name(list_entry)) == 0) { + match = true; + break; + } + } + if (!match && (cur->key.op != OP_NOMATCH)) + goto nomatch; + break; + } case TK_M_SUBSYSTEM: if (match_key(rules, cur, udev_device_get_subsystem(event->dev)) != 0) goto nomatch; @@ -2196,7 +2248,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event program, &rules->buf[rule->rule.filename_off], rule->rule.filename_line); - if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL) != 0) { + if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL, NULL) != 0) { if (cur->key.op != OP_NOMATCH) goto nomatch; } else { @@ -2239,6 +2291,23 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event goto nomatch; break; } + case TK_M_IMPORT_DB: + { + const char *key = &rules->buf[cur->key.value_off]; + const char *value; + + value = udev_device_get_property_value(event->dev_db, key); + if (value != NULL) { + struct udev_list_entry *entry; + + entry = udev_device_add_property(event->dev, key, value); + udev_list_entry_set_flags(entry, 1); + } else { + if (cur->key.op != OP_NOMATCH) + goto nomatch; + } + break; + } case TK_M_IMPORT_PARENT: { char import[UTIL_PATH_SIZE]; @@ -2253,24 +2322,12 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (match_key(rules, cur, event->program_result) != 0) goto nomatch; break; - - case TK_A_IGNORE_DEVICE: - event->ignore_device = 1; - return 0; - break; case TK_A_STRING_ESCAPE_NONE: esc = ESCAPE_NONE; break; case TK_A_STRING_ESCAPE_REPLACE: esc = ESCAPE_REPLACE; break; - case TK_A_NUM_FAKE_PART: - if (strcmp(udev_device_get_subsystem(event->dev), "block") != 0) - break; - if (udev_device_get_sysnum(event->dev) != NULL) - break; - udev_device_set_num_fake_partitions(event->dev, cur->key.num_fake_part); - break; case TK_A_INOTIFY_WATCH: event->inotify_watch = cur->key.watch; break; @@ -2374,13 +2431,19 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event udev_event_apply_format(event, value, temp_value, sizeof(temp_value)); entry = udev_device_add_property(event->dev, name, temp_value); - /* store in db */ - udev_list_entry_set_flag(entry, 1); + /* store in db, skip private keys */ + if (name[0] != '.') + udev_list_entry_set_flags(entry, 1); } else { udev_device_add_property(event->dev, name, NULL); } break; } + case TK_A_TAG: + if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL) + udev_device_cleanup_tags_list(event->dev); + udev_device_add_tag(event->dev, &rules->buf[cur->key.value_off]); + break; case TK_A_NAME: { const char *name = &rules->buf[cur->key.value_off]; @@ -2434,35 +2497,28 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event while (isspace(pos[0])) pos++; next = strchr(pos, ' '); - while (next) { + while (next != NULL) { next[0] = '\0'; - info(event->udev, "LINK '%s' %s:%u\n", - pos, - &rules->buf[rule->rule.filename_off], - rule->rule.filename_line); + info(event->udev, "LINK '%s' %s:%u\n", pos, + &rules->buf[rule->rule.filename_off], rule->rule.filename_line); util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", pos, NULL); - udev_device_add_devlink(event->dev, filename); + udev_device_add_devlink(event->dev, filename, cur->key.devlink_unique); while (isspace(next[1])) next++; pos = &next[1]; next = strchr(pos, ' '); } if (pos[0] != '\0') { - info(event->udev, "LINK '%s' %s:%u\n", - pos, - &rules->buf[rule->rule.filename_off], - rule->rule.filename_line); + info(event->udev, "LINK '%s' %s:%u\n", pos, + &rules->buf[rule->rule.filename_off], rule->rule.filename_line); util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", pos, NULL); - udev_device_add_devlink(event->dev, filename); + udev_device_add_devlink(event->dev, filename, cur->key.devlink_unique); } } break; case TK_A_EVENT_TIMEOUT: udev_device_set_event_timeout(event->dev, cur->key.event_timeout); break; - case TK_A_IGNORE_REMOVE: - udev_device_set_ignore_remove(event->dev, 1); - break; case TK_A_ATTR: { const char *key_name = &rules->buf[cur->key.attr_off]; @@ -2500,8 +2556,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event rule->rule.filename_line); list_entry = udev_list_entry_add(event->udev, &event->run_list, &rules->buf[cur->key.value_off], NULL, 1, 0); - if (cur->key.ignore_error) - udev_list_entry_set_flag(list_entry, 1); + if (cur->key.fail_on_error) + udev_list_entry_set_flags(list_entry, 1); break; } case TK_A_GOTO: @@ -2509,7 +2565,6 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event break; cur = &rules->tokens[cur->key.rule_goto]; continue; - case TK_A_LAST_RULE: case TK_END: return 0;