X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=9166980488fa0362fe8316753dd11fb0d278f35f;hp=a1373312736704946fcf48b9aba6e221a88e4bbd;hb=f7e34eb3e7e8c84cb7ce55ad64e4813e7985936a;hpb=7b5206d60917aeb8d2438b4022b2755b4eb5f126

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index a13733127..916698048 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -104,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 */
@@ -301,7 +298,16 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 				err("invalid SUBSYSTEM operation");
 				goto invalid;
 			}
-			add_rule_key(rule, &rule->subsystem, operation, value);
+			/* bus, class, subsystem events should all be the same */
+			if (strcmp(value, "subsystem") == 0 ||
+			    strcmp(value, "bus") == 0 ||
+			    strcmp(value, "class") == 0) {
+				if (strcmp(value, "bus") == 0 || strcmp(value, "class") == 0)
+					err("'%s' must be specified as 'subsystem' "
+					    "please fix it in %s:%u", value, filename, lineno);
+				add_rule_key(rule, &rule->subsystem, operation, "subsystem|class|bus");
+			} else
+				add_rule_key(rule, &rule->subsystem, operation, value);
 			valid = 1;
 			continue;
 		}
@@ -312,10 +318,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;
 		}
@@ -369,6 +372,11 @@ 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");
@@ -377,7 +385,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 			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)
+			else if (strstr(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)
@@ -556,6 +564,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;
@@ -568,6 +578,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;
@@ -580,7 +595,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 	}
 
 	if (physdev && rule->wait_for_sysfs.operation == KEY_OP_UNSET)
-		err("PHYSDEV* values are deprected and will be removed from a future kernel, "
+		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 */
@@ -627,7 +642,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;
@@ -683,18 +698,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) {