X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=7fa21afa8c17264fc14f5cac7d773b06a4d77bdd;hp=4580a779c6be8b77b3c5ccf8805765be20890a1c;hb=997b164d56257244411aea4d709e47e6ca2da299;hpb=13d11705bf0117365afc3f9210f4d568a2baa69c

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 4580a779c..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;
 		}
 
@@ -437,7 +434,7 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 					char owner[32];
 					uid_t uid = lookup_user(value);
 					dbg("replacing username='%s' by id=%i", value, uid);
-					sprintf(owner, "%li", uid);
+					sprintf(owner, "%u", (unsigned int) uid);
 					add_rule_key(rule, &rule->owner, operation, owner);
 					continue;
 				}
@@ -456,7 +453,7 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 					char group[32];
 					gid_t gid = lookup_group(value);
 					dbg("replacing groupname='%s' by id=%i", value, gid);
-					sprintf(group, "%li", gid);
+					sprintf(group, "%u", (unsigned int) gid);
 					add_rule_key(rule, &rule->group, operation, group);
 					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,40 +588,15 @@ 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 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 */
-	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;
 
@@ -639,7 +611,13 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
 		retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX);
 
 		list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
-			parse_file(rules, name_loop->name);
+			if (stat(name_loop->name, &stats) == 0) {
+				if (stats.st_size)
+					parse_file(rules, name_loop->name);
+				else
+					dbg("empty rules file '%s'", name_loop->name);
+			} else
+				err("could not read '%s': %s", name_loop->name, strerror(errno));
 			list_del(&name_loop->node);
 			free(name_loop);
 		}
@@ -650,10 +628,8 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
 
 void udev_rules_close(struct udev_rules *rules)
 {
-	if (rules->mapped)
-		file_unmap(rules->buf, rules->bufsize);
-	else
+	if (rules->buf) {
 		free(rules->buf);
-
-	rules->buf = NULL;
+		rules->buf = NULL;
+	}
 }