X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=376006c7c4d4a6210d7047277dc45ef681dd8fc5;hp=c36fc8224c69772b9cefee303c922c823b13352a;hb=b2885eeecf517e82830f585a69ebc9c2c60cfa5e;hpb=2858b86c6a2cabe809088c545e39de76ae906ee7

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index c36fc8224..376006c7c 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -1,12 +1,9 @@
 /*
  * udev_rules_parse.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
- *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
  *	Free Software Foundation version 2 of the License.
@@ -31,10 +28,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "logging.h"
 #include "udev_rules.h"
 
 
@@ -52,8 +46,10 @@ struct udev_rule *udev_rules_iter_next(struct udev_rules *rules)
 		return NULL;
 
 	dbg("current=%zi", rules->current);
-	if (rules->current >= rules->bufsize)
+	if (rules->current >= rules->bufsize) {
+		dbg("no more rules");
 		return NULL;
+	}
 
 	/* get next rule */
 	rule = (struct udev_rule *) (rules->buf + rules->current);
@@ -62,13 +58,35 @@ struct udev_rule *udev_rules_iter_next(struct udev_rules *rules)
 	return rule;
 }
 
+struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, const char *label)
+{
+	static struct udev_rule *rule;
+
+next:
+	dbg("current=%zi", rules->current);
+	if (rules->current >= rules->bufsize) {
+		dbg("no more rules");
+		return NULL;
+	}
+	rule = (struct udev_rule *) (rules->buf + rules->current);
+
+	if (strcmp(&rule->buf[rule->label.val_off], label) != 0) {
+		dbg("moving forward, looking for label '%s'", label);
+		rules->current += sizeof(struct udev_rule) + rule->bufsize;
+		goto next;
+	}
+
+	dbg("found label '%s'", label);
+	return rule;
+}
+
 static int get_key(char **line, char **key, enum key_operation *operation, char **value)
 {
 	char *linepos;
 	char *temp;
 
 	linepos = *line;
-	if (!linepos)
+	if (linepos == NULL && linepos[0] == '\0')
 		return -1;
 
 	/* skip whitespace */
@@ -76,7 +94,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')
@@ -99,6 +120,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] == '=') {
@@ -131,6 +154,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] == '"')
@@ -217,6 +242,7 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 	int valid;
 	char *linepos;
 	char *attr;
+	size_t padding;
 	int retval;
 
 	/* get all the keys */
@@ -237,6 +263,18 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 		if (retval)
 			break;
 
+		if (strcasecmp(key, "LABEL") == 0) {
+			add_rule_key(rule, &rule->label, operation, value);
+			valid = 1;
+			continue;
+		}
+
+		if (strcasecmp(key, "GOTO") == 0) {
+			add_rule_key(rule, &rule->goto_label, operation, value);
+			valid = 1;
+			continue;
+		}
+
 		if (strcasecmp(key, "KERNEL") == 0) {
 			add_rule_key(rule, &rule->kernel_name, operation, value);
 			valid = 1;
@@ -284,6 +322,12 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 			continue;
 		}
 
+		if (strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
+			add_rule_key(rule, &rule->wait_for_sysfs, operation, value);
+			valid = 1;
+			continue;
+		}
+
 		if (strncasecmp(key, "ENV", sizeof("ENV")-1) == 0) {
 			attr = get_key_attribute(key + sizeof("ENV")-1);
 			if (attr == NULL) {
@@ -305,9 +349,13 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 			attr = get_key_attribute(key + sizeof("IMPORT")-1);
 			if (attr && strstr(attr, "program")) {
 				dbg("IMPORT will be executed");
-				rule->import_exec = 1;
+				rule->import_type  = IMPORT_PROGRAM;
 			} else if (attr && strstr(attr, "file")) {
 				dbg("IMPORT will be included as file");
+				rule->import_type  = IMPORT_FILE;
+			} else if (attr && strstr(attr, "parent")) {
+				dbg("IMPORT will include the parent values");
+				rule->import_type = IMPORT_PARENT;
 			} else {
 				/* figure it out if it is executable */
 				char file[PATH_SIZE];
@@ -318,10 +366,23 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 				pos = strchr(file, ' ');
 				if (pos)
 					pos[0] = '\0';
+
+				/* allow programs in /lib/udev called without the path */
+				if (strchr(file, '/') == NULL) {
+					strlcpy(file, "/lib/udev/", sizeof(file));
+					strlcat(file, value, sizeof(file));
+					pos = strchr(file, ' ');
+					if (pos)
+						pos[0] = '\0';
+				}
+
 				dbg("IMPORT auto mode for '%s'", file);
 				if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
-						dbg("IMPORT is executable, will be executed");
-						rule->import_exec = 1;
+					dbg("IMPORT is executable, will be executed (autotype)");
+					rule->import_type  = IMPORT_PROGRAM;
+				} else {
+					dbg("IMPORT is not executable, will be included as file (autotype)");
+					rule->import_type  = IMPORT_FILE;
 				}
 			}
 			add_rule_key(rule, &rule->import, operation, value);
@@ -359,6 +420,8 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 					rule->ignore_remove = 1;
 				}
 			}
+			if (value[0] == '\0')
+				dbg("name empty, not creation supressed");
 			add_rule_key(rule, &rule->name, operation, value);
 			continue;
 		}
@@ -378,7 +441,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;
 				}
@@ -397,8 +460,8 @@ 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);
-					add_rule_key(rule, &rule->owner, operation, group);
+					sprintf(group, "%u", (unsigned int) gid);
+					add_rule_key(rule, &rule->group, operation, group);
 					continue;
 				}
 			}
@@ -452,11 +515,17 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 
 	/* grow buffer and add rule */
 	rule_size = sizeof(struct udev_rule) + rule->bufsize;
+	padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t);
+	dbg("add %zi padding bytes", padding);
+	rule_size += padding;
+	rule->bufsize += padding;
+
 	rules->buf = realloc(rules->buf, rules->bufsize + rule_size);
 	if (!rules->buf) {
 		err("realloc failed");
 		goto exit;
 	}
+	dbg("adding rule to offset %zi", rules->bufsize);
 	memcpy(rules->buf + rules->bufsize, rule, rule_size);
 	rules->bufsize += rule_size;
 exit:
@@ -476,7 +545,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);
@@ -526,39 +595,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;
-	}
-
-	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;
 
@@ -573,20 +618,25 @@ 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);
 		}
 	}
 
 	return retval;
 }
 
-void udev_rules_close(struct udev_rules *rules)
+void udev_rules_cleanup(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;
+	}
 }