X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=929a5e6f4cca15e3107a1158a22462d048b5f31a;hp=71ca4827288daca318dc9ba81ca5554ea93c0385;hb=ffd5c6893756af43daf2a9a30bdcff13784a1ec4;hpb=6b493a20e1dbf90a4e54d3be37027fa906220c31

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 71ca48272..929a5e6f4 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -37,9 +37,45 @@
 #include "logging.h"
 #include "udev_rules.h"
 
-LIST_HEAD(udev_rule_list);
+/* rules parsed from .rules files*/
+static LIST_HEAD(rules_list);
+static struct list_head *rules_list_current;
 
-static int add_config_dev(struct udev_rule *rule)
+/* mapped compiled rules stored on disk */
+static struct udev_rule *rules_array = NULL;
+static size_t rules_array_current;
+static size_t rules_array_size = 0;
+
+static size_t rules_count = 0;
+
+int udev_rules_iter_init(void)
+{
+	rules_list_current = rules_list.next;
+	rules_array_current = 0;
+
+	return 0;
+}
+
+struct udev_rule *udev_rules_iter_next(void)
+{
+	static struct udev_rule *rule;
+
+	if (rules_array) {
+		if (rules_array_current >= rules_count)
+			return NULL;
+		rule = &rules_array[rules_array_current];
+		rules_array_current++;
+	} else {
+		dbg("head=%p current=%p next=%p", &rules_list, rules_list_current, rules_list_current->next);
+		if (rules_list_current == &rules_list)
+			return NULL;
+		rule = list_entry(rules_list_current, struct udev_rule, node);
+		rules_list_current = rules_list_current->next;
+	}
+	return rule;
+}
+
+static int add_rule_to_list(struct udev_rule *rule)
 {
 	struct udev_rule *tmp_rule;
 
@@ -47,7 +83,7 @@ static int add_config_dev(struct udev_rule *rule)
 	if (tmp_rule == NULL)
 		return -ENOMEM;
 	memcpy(tmp_rule, rule, sizeof(struct udev_rule));
-	list_add_tail(&tmp_rule->node, &udev_rule_list);
+	list_add_tail(&tmp_rule->node, &rules_list);
 
 	dbg("name='%s', symlink='%s', bus='%s', id='%s', "
 	    "sysfs_file[0]='%s', sysfs_value[0]='%s', "
@@ -89,6 +125,8 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 			break;
 		if (linepos[0] == '!')
 			break;
+		if (linepos[0] == ':')
+			break;
 	}
 
 	/* remember end of key */
@@ -115,6 +153,10 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 		*operation = KEY_OP_ASSIGN;
 		linepos++;
 		dbg("operator=assign");
+	} else if (linepos[0] == ':' && linepos[1] == '=') {
+		*operation = KEY_OP_ASSIGN_FINAL;
+		linepos += 2;
+		dbg("operator=assign_final");
 	} else
 		return -1;
 
@@ -236,7 +278,7 @@ static int rules_parse(const char *filename)
 		while (1) {
 			char *key;
 			char *value;
-			enum key_operation operation = KEY_OP_UNKNOWN;
+			enum key_operation operation = KEY_OP_UNSET;
 
 			retval = get_key(&linepos, &key, &operation, &value);
 			if (retval)
@@ -256,6 +298,20 @@ static int rules_parse(const char *filename)
 				continue;
 			}
 
+			if (strcasecmp(key, KEY_ACTION) == 0) {
+				strlcpy(rule.action, value, sizeof(rule.action));
+				rule.action_operation = operation;
+				valid = 1;
+				continue;
+			}
+
+			if (strcasecmp(key, KEY_DEVPATH) == 0) {
+				strlcpy(rule.devpath, value, sizeof(rule.devpath));
+				rule.devpath_operation = operation;
+				valid = 1;
+				continue;
+			}
+
 			if (strcasecmp(key, KEY_BUS) == 0) {
 				strlcpy(rule.bus, value, sizeof(rule.bus));
 				rule.bus_operation = operation;
@@ -312,6 +368,42 @@ static int rules_parse(const char *filename)
 				continue;
 			}
 
+			if (strcasecmp(key, KEY_MODALIAS) == 0) {
+				strlcpy(rule.modalias, value, sizeof(rule.modalias));
+				rule.modalias_operation = operation;
+				valid = 1;
+				continue;
+			}
+
+			if (strncasecmp(key, KEY_IMPORT, sizeof(KEY_IMPORT)-1) == 0) {
+				attr = get_key_attribute(key + sizeof(KEY_IMPORT)-1);
+				if (attr && strstr(attr, "program")) {
+					dbg(KEY_IMPORT" will be executed");
+					rule.import_exec = 1;
+				} else if (attr && strstr(attr, "file")) {
+					dbg(KEY_IMPORT" will be included as file");
+				} else {
+					/* figure it out if it is executable */
+					char file[PATH_SIZE];
+					char *pos;
+					struct stat stats;
+
+					strlcpy(file, value, sizeof(file));
+					pos = strchr(file, ' ');
+					if (pos)
+						pos[0] = '\0';
+					dbg(KEY_IMPORT" auto mode for '%s'", file);
+					if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
+							dbg(KEY_IMPORT" is executable, will be executed");
+							rule.import_exec = 1;
+					}
+				}
+				strlcpy(rule.import, value, sizeof(rule.import));
+				rule.import_operation = operation;
+				valid = 1;
+				continue;
+			}
+
 			if (strcasecmp(key, KEY_DRIVER) == 0) {
 				strlcpy(rule.driver, value, sizeof(rule.driver));
 				rule.driver_operation = operation;
@@ -336,7 +428,6 @@ static int rules_parse(const char *filename)
 
 			if (strncasecmp(key, KEY_NAME, sizeof(KEY_NAME)-1) == 0) {
 				attr = get_key_attribute(key + sizeof(KEY_NAME)-1);
-				/* FIXME: remove old style options and make OPTIONS= mandatory */
 				if (attr != NULL) {
 					if (strstr(attr, OPTION_PARTITIONS) != NULL) {
 						dbg("creation of partition nodes requested");
@@ -347,34 +438,43 @@ static int rules_parse(const char *filename)
 						rule.ignore_remove = 1;
 					}
 				}
-				if (value[0] != '\0')
-					strlcpy(rule.name, value, sizeof(rule.name));
-				else
-					rule.ignore_device = 1;
+				rule.name_operation = operation;
+				strlcpy(rule.name, value, sizeof(rule.name));
 				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(key, KEY_SYMLINK) == 0) {
 				strlcpy(rule.symlink, value, sizeof(rule.symlink));
+				rule.symlink_operation = operation;
 				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(key, KEY_OWNER) == 0) {
 				strlcpy(rule.owner, value, sizeof(rule.owner));
+				rule.owner_operation = operation;
 				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(key, KEY_GROUP) == 0) {
 				strlcpy(rule.group, value, sizeof(rule.group));
+				rule.group_operation = operation;
 				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(key, KEY_MODE) == 0) {
 				rule.mode = strtol(value, NULL, 8);
+				rule.mode_operation = operation;
+				valid = 1;
+				continue;
+			}
+
+			if (strcasecmp(key, KEY_RUN) == 0) {
+				strlcpy(rule.run, value, sizeof(rule.run));
+				rule.run_operation = operation;
 				valid = 1;
 				continue;
 			}
@@ -408,13 +508,6 @@ static int rules_parse(const char *filename)
 		if (!valid)
 			goto error;
 
-		/* simple plausibility checks for given keys */
-		if ((rule.sysfs_pair[0].name[0] == '\0') ^
-		    (rule.sysfs_pair[0].value[0] == '\0')) {
-			err("inconsistency in " KEY_SYSFS " key");
-			goto error;
-		}
-
 		if ((rule.result[0] != '\0') && (program_given == 0)) {
 			info(KEY_RESULT " is only useful when " KEY_PROGRAM " is called in any rule before");
 			goto error;
@@ -422,9 +515,9 @@ static int rules_parse(const char *filename)
 
 		rule.config_line = lineno;
 		strlcpy(rule.config_file, filename, sizeof(rule.config_file));
-		retval = add_config_dev(&rule);
+		retval = add_rule_to_list(&rule);
 		if (retval) {
-			dbg("add_config_dev returned with error %d", retval);
+			dbg("add_rule_to_list returned with error %d", retval);
 			continue;
 error:
 			err("parse error %s, line %d:%d, rule skipped",
@@ -436,20 +529,47 @@ error:
 	return retval;
 }
 
+static int rules_map(const char *filename)
+{
+	char *buf;
+	size_t size;
+
+	if (file_map(filename, &buf, &size))
+		return -1;
+	if (size == 0)
+		return -1;
+	rules_array = (struct udev_rule *) buf;
+	rules_array_size = size;
+	rules_count = size / sizeof(struct udev_rule);
+	dbg("found %zi compiled rules", rules_count);
+
+	return 0;
+}
+
 int udev_rules_init(void)
 {
+	char comp[PATH_SIZE];
 	struct stat stats;
 	int retval;
 
+	strlcpy(comp, udev_rules_filename, sizeof(comp));
+	strlcat(comp, ".compiled", sizeof(comp));
+	if (stat(comp, &stats) == 0) {
+		dbg("parse compiled rules '%s'", comp);
+		return rules_map(comp);
+	}
+
 	if (stat(udev_rules_filename, &stats) != 0)
 		return -1;
 
-	if ((stats.st_mode & S_IFMT) != S_IFDIR)
+	if ((stats.st_mode & S_IFMT) != S_IFDIR) {
+		dbg("parse single rules file '%s'", udev_rules_filename);
 		retval = rules_parse(udev_rules_filename);
-	else {
+	} 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);
 
 		list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
@@ -466,9 +586,11 @@ void udev_rules_close(void)
 	struct udev_rule *rule;
 	struct udev_rule *temp_rule;
 
-	list_for_each_entry_safe(rule, temp_rule, &udev_rule_list, node) {
-		list_del(&rule->node);
-		free(rule);
-	}
+	if (rules_array)
+		file_unmap(rules_array, rules_array_size);
+	else
+		list_for_each_entry_safe(rule, temp_rule, &rules_list, node) {
+			list_del(&rule->node);
+			free(rule);
+		}
 }
-