X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=535b59590a0e21310f5c263168eb6ca83d6e7a2f;hp=ecb6a7be31b1133ab2a104c02dbcded411a13ba6;hb=26133d54e06806456cc990e1cb63ca5ae35052ab;hpb=d0c8cb7d9c6e610a9f5ed840d023362c25413d7e

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index ecb6a7be3..535b59590 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 <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
@@ -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.
  *
  */
 
@@ -243,6 +241,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 */
@@ -321,7 +320,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 			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");
@@ -345,7 +344,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) {
@@ -368,25 +367,33 @@ 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 (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");
 				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;
@@ -572,6 +579,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;