X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=bfbad367e9d41e4dfda8f806e5b737c08099bb3c;hp=5603ee1d11fa83a26578e09ed2a521dd9c7882fa;hb=596714857b0c6b2779e861e4069d63f0fa27aa28;hpb=8bb39322f092fde89bf1082f51715a2f2da1c187 diff --git a/udev_rules_parse.c b/udev_rules_parse.c index 5603ee1d1..bfbad367e 100644 --- a/udev_rules_parse.c +++ b/udev_rules_parse.c @@ -1,8 +1,6 @@ /* - * udev_rules_parse.c - * * Copyright (C) 2003,2004 Greg Kroah-Hartman - * Copyright (C) 2003-2005 Kay Sievers + * Copyright (C) 2003-2006 Kay Sievers * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -15,7 +13,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ @@ -106,12 +104,9 @@ static int get_key(char **line, char **key, enum key_operation *operation, char break; if (linepos[0] == '=') break; - if (linepos[0] == '+') - break; - if (linepos[0] == '!') - break; - if (linepos[0] == ':') - break; + if ((linepos[0] == '+') || (linepos[0] == '!') || (linepos[0] == ':')) + if (linepos[1] == '=') + break; } /* remember end of key */ @@ -243,6 +238,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena char *linepos; char *attr; size_t padding; + int physdev = 0; int retval; /* get all the keys */ @@ -313,10 +309,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena err("invalid DRIVER operation"); goto invalid; } - err("DRIVER== will change in a future relase, " - "please use DRIVERS== in %s:%u", filename, lineno); - /* FIXME: this should be rule->driver to match only the event device */ - add_rule_key(rule, &rule->drivers, operation, value); + add_rule_key(rule, &rule->driver, operation, value); valid = 1; continue; } @@ -370,11 +363,22 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena 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 ATTRS operation"); + goto invalid; + } attr = get_key_attribute(key + sizeof("ATTRS")-1); if (attr == NULL) { err("error parsing ATTRS attribute"); goto invalid; } + if (strncmp(attr, "device/", 7) == 0) + err("the 'device' link is deprecated and will be removed from a future kernel, " + "please fix it in %s:%u", filename, lineno); + else if (strchr(attr, '/') != NULL) + err("do not reference parent sysfs directories directly, that may break with a future kernel, " + "please fix it in %s:%u", filename, lineno); if (add_rule_key_pair(rule, &rule->attrs, operation, attr, value) != 0) goto invalid; valid = 1; @@ -387,6 +391,8 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena err("error parsing ENV attribute"); goto invalid; } + if (strncmp(attr, "PHYSDEV", 7) == 0) + physdev = 1; if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0) goto invalid; valid = 1; @@ -549,6 +555,8 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena } if (strcasecmp(key, "OPTIONS") == 0) { + const char *pos; + if (strstr(value, "last_rule") != NULL) { dbg("last rule to be applied"); rule->last_rule = 1; @@ -561,6 +569,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena dbg("remove event should be ignored"); rule->ignore_remove = 1; } + pos = strstr(value, "link_priority="); + if (pos != NULL) { + rule->link_priority = atoi(&pos[strlen("link_priority=")]); + info("link priority=%i", rule->link_priority); + } if (strstr(value, "all_partitions") != NULL) { dbg("creation of partition nodes requested"); rule->partitions = DEFAULT_PARTITIONS_COUNT; @@ -572,6 +585,10 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena err("unknown key '%s' in %s:%u", key, filename, lineno); } + if (physdev && rule->wait_for_sysfs.operation == KEY_OP_UNSET) + err("PHYSDEV* values are deprecated and will be removed from a future kernel, " + "please fix it in %s:%u", filename, lineno); + /* skip line if not any valid key was found */ if (!valid) goto invalid; @@ -616,7 +633,7 @@ static int parse_file(struct udev_rules *rules, const char *filename) err("can't open '%s' as rules file: %s", filename, strerror(errno)); return -1; } - dbg("reading '%s' as rules file", filename); + info("reading '%s' as rules file", filename); /* loop through the whole file */ cur = 0; @@ -672,18 +689,18 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names) rules->resolve_names = resolve_names; /* parse rules file or all matching files in directory */ - if (stat(udev_rules_filename, &stats) != 0) + if (stat(udev_rules_dir, &stats) != 0) return -1; if ((stats.st_mode & S_IFMT) != S_IFDIR) { - dbg("parse single rules file '%s'", udev_rules_filename); - retval = parse_file(rules, udev_rules_filename); + dbg("parse single rules file '%s'", udev_rules_dir); + retval = parse_file(rules, udev_rules_dir); } else { struct name_entry *name_loop, *name_tmp; LIST_HEAD(name_list); - dbg("parse rules directory '%s'", udev_rules_filename); - retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX); + dbg("parse rules directory '%s'", udev_rules_dir); + retval = add_matching_files(&name_list, udev_rules_dir, RULESFILE_SUFFIX); list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) { if (stat(name_loop->name, &stats) == 0) {