X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_rules_parse.c;h=55412dba3c5a8e7e717236ffff1f0b8e321b300f;hb=9b434de102c8d4f74842bc6533c92cb3a4887d8d;hp=db83a67953fd15e63cd3b3cb6c92bc08f712f7b7;hpb=38285d23d702258d3b219532a9874555e797a292;p=elogind.git

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index db83a6795..55412dba3 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -55,7 +55,7 @@ static int add_config_dev(struct udev_rule *rule)
 	    "owner='%s', group='%s', mode=%#o, "
 	    "all_partions=%u, ignore_remove=%u, ignore_device=%u, last_rule=%u",
 	    rule->name, rule->symlink, rule->bus, rule->id,
-	    rule->sysfs_pair[0].file, rule->sysfs_pair[0].value,
+	    rule->sysfs_pair[0].name, rule->sysfs_pair[0].value,
 	    rule->kernel, rule->program, rule->result, rule->owner, rule->group, rule->mode,
 	    rule->partitions, rule->ignore_remove, rule->ignore_device, rule->last_rule);
 
@@ -168,7 +168,7 @@ static char *get_key_attribute(char *str)
 	return NULL;
 }
 
-static int rules_parse(struct udevice *udev, const char *filename)
+static int rules_parse(const char *filename)
 {
 	char line[LINE_SIZE];
 	char *bufline;
@@ -271,29 +271,44 @@ static int rules_parse(struct udevice *udev, const char *filename)
 			}
 
 			if (strncasecmp(key, KEY_SYSFS, sizeof(KEY_SYSFS)-1) == 0) {
-				struct sysfs_pair *pair = &rule.sysfs_pair[0];
-				int sysfs_pair_num = 0;
-
-				/* find first unused pair */
-				while (pair->file[0] != '\0') {
-					++sysfs_pair_num;
-					if (sysfs_pair_num >= MAX_SYSFS_PAIRS) {
-						pair = NULL;
-						break;
-					}
-					++pair;
+				struct key_pair *pair;
+
+				if (rule.sysfs_pair_count >= KEY_SYSFS_PAIRS_MAX) {
+					dbg("skip rule, to many " KEY_SYSFS " keys in a single rule");
+					goto error;
 				}
-				if (pair) {
-					attr = get_key_attribute(key + sizeof(KEY_SYSFS)-1);
-					if (attr == NULL) {
-						dbg("error parsing " KEY_SYSFS " attribute");
-						continue;
-					}
-					strlcpy(pair->file, attr, sizeof(pair->file));
-					strlcpy(pair->value, value, sizeof(pair->value));
-					pair->operation = operation;
-					valid = 1;
+				pair = &rule.sysfs_pair[rule.sysfs_pair_count];
+				attr = get_key_attribute(key + sizeof(KEY_SYSFS)-1);
+				if (attr == NULL) {
+					dbg("error parsing " KEY_SYSFS " attribute");
+					goto error;
+				}
+				strlcpy(pair->name, attr, sizeof(pair->name));
+				strlcpy(pair->value, value, sizeof(pair->value));
+				pair->operation = operation;
+				rule.sysfs_pair_count++;
+				valid = 1;
+				continue;
+			}
+
+			if (strncasecmp(key, KEY_ENV, sizeof(KEY_ENV)-1) == 0) {
+				struct key_pair *pair;
+
+				if (rule.env_pair_count >= KEY_ENV_PAIRS_MAX) {
+					dbg("skip rule, to many " KEY_ENV " keys in a single rule");
+					goto error;
+				}
+				pair = &rule.env_pair[rule.env_pair_count];
+				attr = get_key_attribute(key + sizeof(KEY_ENV)-1);
+				if (attr == NULL) {
+					dbg("error parsing " KEY_ENV " attribute");
+					continue;
 				}
+				strlcpy(pair->name, attr, sizeof(pair->name));
+				strlcpy(pair->value, value, sizeof(pair->value));
+				pair->operation = operation;
+				rule.env_pair_count++;
+				valid = 1;
 				continue;
 			}
 
@@ -394,7 +409,7 @@ static int rules_parse(struct udevice *udev, const char *filename)
 			goto error;
 
 		/* simple plausibility checks for given keys */
-		if ((rule.sysfs_pair[0].file[0] == '\0') ^
+		if ((rule.sysfs_pair[0].name[0] == '\0') ^
 		    (rule.sysfs_pair[0].value[0] == '\0')) {
 			info("inconsistency in " KEY_SYSFS " key");
 			goto error;
@@ -431,9 +446,18 @@ int udev_rules_init(void)
 		return -1;
 
 	if ((stats.st_mode & S_IFMT) != S_IFDIR)
-		retval = rules_parse(NULL, udev_rules_filename);
-	else
-		retval = call_foreach_file(rules_parse, NULL, udev_rules_filename, RULEFILE_SUFFIX);
+		retval = rules_parse(udev_rules_filename);
+	else {
+		struct name_entry *name_loop, *name_tmp;
+		LIST_HEAD(name_list);
+
+		retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX);
+
+		list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
+			rules_parse(name_loop->name);
+			list_del(&name_loop->node);
+		}
+	}
 
 	return retval;
 }