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

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index be0757374..488b7a7ff 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -89,7 +89,7 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 	char *temp;
 
 	linepos = *line;
-	if (!linepos)
+	if (linepos == NULL && linepos[0] == '\0')
 		return -1;
 
 	/* skip whitespace */
@@ -97,7 +97,10 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 		linepos++;
 
 	/* get the key */
+	if (linepos[0] == '\0')
+		return -1;
 	*key = linepos;
+
 	while (1) {
 		linepos++;
 		if (linepos[0] == '\0')
@@ -120,6 +123,8 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 	/* skip whitespace after key */
 	while (isspace(linepos[0]))
 		linepos++;
+	if (linepos[0] == '\0')
+		return -1;
 
 	/* get operation type */
 	if (linepos[0] == '=' && linepos[1] == '=') {
@@ -152,6 +157,8 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 	/* skip whitespace after operator */
 	while (isspace(linepos[0]))
 		linepos++;
+	if (linepos[0] == '\0')
+		return -1;
 
 	/* get the value*/
 	if (linepos[0] == '"')
@@ -600,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;
@@ -610,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;
 
@@ -634,6 +644,7 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
 		list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
 			parse_file(rules, name_loop->name);
 			list_del(&name_loop->node);
+			free(name_loop);
 		}
 	}
 
@@ -642,10 +653,12 @@ 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
-		free(rules->buf);
-
-	rules->buf = NULL;
+	if (rules->buf) {
+		if (rules->mapped) {
+			rules->mapped = 0;
+			file_unmap(rules->buf, rules->bufsize);
+		} else
+			free(rules->buf);
+		rules->buf = NULL;
+	}
 }