X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=7fa21afa8c17264fc14f5cac7d773b06a4d77bdd;hp=7d1853acbe96ecaf3ef3a639c390e96c19354f22;hb=3e0f8812f8c824648db7cc6886265ed186685488;hpb=916c5e4725ef4558b752c6464deef6492c8ac31a

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 7d1853acb..7fa21afa8 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -413,12 +413,9 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 					rule->ignore_remove = 1;
 				}
 			}
-			if (value[0] == '\0') {
-				dbg("name empty device should be ignored");
-				rule->name.operation = operation;
-				rule->ignore_device = 1;
-			} else
-				add_rule_key(rule, &rule->name, operation, value);
+			if (value[0] == '\0')
+				dbg("name empty, not creation supressed");
+			add_rule_key(rule, &rule->name, operation, value);
 			continue;
 		}
 
@@ -541,7 +538,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 	int retval = 0;
 
 	if (file_map(filename, &buf, &bufsize) != 0) {
-		err("can't open '%s' as rules file", filename);
+		err("can't open '%s' as rules file: %s", filename, strerror(errno));
 		return -1;
 	}
 	dbg("reading '%s' as rules file", filename);
@@ -591,42 +588,14 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 	return retval;
 }
 
-static int rules_map(struct udev_rules *rules, const char *filename)
-{
-	if (file_map(filename, &rules->buf, &rules->bufsize)) {
-		rules->buf = NULL;
-		return -1;
-	}
-	if (rules->bufsize == 0) {
-		file_unmap(rules->buf, rules->bufsize);
-		rules->buf = NULL;
-		return -1;
-	}
-	rules->mapped = 1;
-
-	return 0;
-}
-
-int udev_rules_init(struct udev_rules *rules, int read_compiled, int resolve_names)
+int udev_rules_init(struct udev_rules *rules, int resolve_names)
 {
-	char comp[PATH_SIZE];
 	struct stat stats;
 	int retval;
 
 	memset(rules, 0x00, sizeof(struct udev_rules));
 	rules->resolve_names = resolve_names;
 
-	/* check for precompiled rules */
-	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;
@@ -648,7 +617,7 @@ int udev_rules_init(struct udev_rules *rules, int read_compiled, int resolve_nam
 				else
 					dbg("empty rules file '%s'", name_loop->name);
 			} else
-				dbg("could not read '%s'", name_loop->name);
+				err("could not read '%s': %s", name_loop->name, strerror(errno));
 			list_del(&name_loop->node);
 			free(name_loop);
 		}
@@ -660,11 +629,7 @@ int udev_rules_init(struct udev_rules *rules, int read_compiled, int resolve_nam
 void udev_rules_close(struct udev_rules *rules)
 {
 	if (rules->buf) {
-		if (rules->mapped) {
-			rules->mapped = 0;
-			file_unmap(rules->buf, rules->bufsize);
-		} else
-			free(rules->buf);
+		free(rules->buf);
 		rules->buf = NULL;
 	}
 }