X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_rules_parse.c;h=488b7a7ff0c31b258fcb749eb9e744d90afda39d;hb=34c00c915c6dd9d063551732169cb3c3126376ad;hp=cededf002d8518c2b62074c3936b7504cecc9570;hpb=63cc8f049100c9b76ca4e37fc5c8976b6e92a207;p=elogind.git

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index cededf002..488b7a7ff 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -607,7 +607,7 @@ static int rules_map(struct udev_rules *rules, const char *filename)
 	return 0;
 }
 
-int udev_rules_init(struct udev_rules *rules, int resolve_names)
+int udev_rules_init(struct udev_rules *rules, int read_compiled, int resolve_names)
 {
 	char comp[PATH_SIZE];
 	struct stat stats;
@@ -617,14 +617,17 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
 	rules->resolve_names = resolve_names;
 
 	/* check for precompiled rules */
-	strlcpy(comp, udev_rules_filename, sizeof(comp));
-	strlcat(comp, ".compiled", sizeof(comp));
-	if (stat(comp, &stats) == 0) {
-		dbg("map compiled rules '%s'", comp);
-		if (rules_map(rules, comp) == 0)
-			return 0;
+	if (read_compiled) {
+		strlcpy(comp, udev_rules_filename, sizeof(comp));
+		strlcat(comp, ".compiled", sizeof(comp));
+		if (stat(comp, &stats) == 0) {
+			dbg("map compiled rules '%s'", comp);
+			if (rules_map(rules, comp) == 0)
+				return 0;
+		}
 	}
 
+	/* parse rules file or all matching files in directory */
 	if (stat(udev_rules_filename, &stats) != 0)
 		return -1;