X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_rules_parse.c;h=9a12d53816e59f4dfaa50d3add57e4c243f5c925;hb=3bf1efa8ddee3999656b0454734bc6b39fc7c00b;hp=535b59590a0e21310f5c263168eb6ca83d6e7a2f;hpb=b4e4b5a5db32177ec422c96d4440651a85d59704;p=elogind.git

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 535b59590..9a12d5381 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 */
@@ -235,6 +232,7 @@ static int add_rule_key_pair(struct udev_rule *rule, struct key_pairs *pairs,
 
 static int add_to_rules(struct udev_rules *rules, char *line, const char *filename, unsigned int lineno)
 {
+	char buf[sizeof(struct udev_rule) + LINE_SIZE];
 	struct udev_rule *rule;
 	size_t rule_size;
 	int valid;
@@ -244,15 +242,12 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 	int physdev = 0;
 	int retval;
 
-	/* get all the keys */
-	rule = calloc(1, sizeof (struct udev_rule) + LINE_SIZE);
-	if (!rule) {
-		err("malloc failed");
-		return -1;
-	}
+	memset(buf, 0x00, sizeof(buf));
+	rule = (struct udev_rule *) buf;
 	linepos = line;
 	valid = 0;
 
+	/* get all the keys */
 	while (1) {
 		char *key;
 		char *value;
@@ -301,7 +296,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 +316,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 +370,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 +383,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)
@@ -462,6 +468,15 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 			continue;
 		}
 
+		if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+			attr = get_key_attribute(key + sizeof("TEST")-1);
+			if (attr != NULL)
+				rule->test_mode_mask = strtol(attr, NULL, 8);
+			add_rule_key(rule, &rule->test, operation, value);
+			valid = 1;
+			continue;
+		}
+
 		if (strcasecmp(key, "RUN") == 0) {
 			add_rule_key(rule, &rule->run, operation, value);
 			valid = 1;
@@ -556,6 +571,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 +585,19 @@ 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);
+			}
+			pos = strstr(value, "string_escape=");
+			if (pos != NULL) {
+				pos = &pos[strlen("string_escape=")];
+				if (strncmp(pos, "none", strlen("none")) == 0)
+					rule->string_escape = ESCAPE_NONE;
+				else if (strncmp(pos, "replace", strlen("replace")) == 0)
+					rule->string_escape = ESCAPE_REPLACE;
+			}
 			if (strstr(value, "all_partitions") != NULL) {
 				dbg("creation of partition nodes requested");
 				rule->partitions = DEFAULT_PARTITIONS_COUNT;
@@ -603,11 +633,9 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 	memcpy(rules->buf + rules->bufsize, rule, rule_size);
 	rules->bufsize += rule_size;
 exit:
-	free(rule);
 	return 0;
 
 invalid:
-	free(rule);
 	err("invalid rule '%s:%u'", filename, lineno);
 	return -1;
 }
@@ -627,7 +655,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 +711,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) {