/*
- * udev_rules_parse.c
- *
* Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2006 Kay Sievers <kay.sievers@vrfy.org>
*
* 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
*
* 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.
*
*/
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 */
char *linepos;
char *attr;
size_t padding;
+ int physdev = 0;
int retval;
/* get all the keys */
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;
}
- if (strncasecmp(key, "ATTR", sizeof("ATTR")-1) == 0) {
+ if (strncasecmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
attr = get_key_attribute(key + sizeof("ATTR")-1);
if (attr == NULL) {
err("error parsing ATTR attribute");
continue;
}
- if (strncasecmp(key, "ATTRS", sizeof("ATTRS")-1) == 0 ||
- strncasecmp(key, "SYSFS", sizeof("SYSFS")-1) == 0) {
+ 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;
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");
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;
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;
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;
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) {