X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev_parse.c;h=eabd9c98bb1957f089af68b14e958cf7d22fd009;hp=f4ffdb21d6687d693e8fa526e1935bdca3efe487;hb=5e39f90b14ccf242618086a0242000fc11317a75;hpb=c81b35c08bbd7789883993ea280e0d3772cce440

diff --git a/namedev_parse.c b/namedev_parse.c
index f4ffdb21d..eabd9c98b 100644
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -4,6 +4,7 @@
  * 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
@@ -33,16 +34,14 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <dirent.h>
 #include <errno.h>
 
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "logging.h"
 #include "namedev.h"
 
-LIST_HEAD(file_list);
-
+LIST_HEAD(config_device_list);
 
 static int add_config_dev(struct config_device *new_dev)
 {
@@ -61,7 +60,7 @@ void dump_config_dev(struct config_device *dev)
 {
 	dbg_parse("name='%s', symlink='%s', bus='%s', place='%s', id='%s', "
 		  "sysfs_file[0]='%s', sysfs_value[0]='%s', "
-		  "kernel='%s', program='%s', result='%s'",
+		  "kernel='%s', program='%s', result='%s'"
 		  "owner='%s', group='%s', mode=%#o",
 		  dev->name, dev->symlink, dev->bus, dev->place, dev->id,
 		  dev->sysfs_pair[0].file, dev->sysfs_pair[0].value,
@@ -77,46 +76,7 @@ void dump_config_dev_list(void)
 		dump_config_dev(dev);
 }
 
-static int add_perm_dev(struct perm_device *new_dev)
-{
-	struct perm_device *dev;
-	struct perm_device *tmp_dev;
-
-	/* update the values if we already have the device */
-	list_for_each_entry(dev, &perm_device_list, node) {
-		if (strcmp(new_dev->name, dev->name) != 0)
-			continue;
-
-		set_empty_perms(dev, new_dev->mode, new_dev->owner, new_dev->group);
-		return 0;
-	}
-
-	/* not found, add new structure to the perm list */
-	tmp_dev = malloc(sizeof(*tmp_dev));
-	if (!tmp_dev)
-		return -ENOMEM;
-
-	memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
-	list_add_tail(&tmp_dev->node, &perm_device_list);
-	//dump_perm_dev(tmp_dev);
-	return 0;
-}
-
-void dump_perm_dev(struct perm_device *dev)
-{
-	dbg_parse("name='%s', owner='%s', group='%s', mode=%#o",
-		  dev->name, dev->owner, dev->group, dev->mode);
-}
-
-void dump_perm_dev_list(void)
-{
-	struct perm_device *dev;
-
-	list_for_each_entry(dev, &perm_device_list, node)
-		dump_perm_dev(dev);
-}
-
-/* extract possible KEY{attr} or KEY_attr */
+/* extract possible KEY{attr} */
 static char *get_key_attribute(char *str)
 {
 	char *pos;
@@ -135,19 +95,13 @@ static char *get_key_attribute(char *str)
 		return attr;
 	}
 
-	attr = strchr(str, '_');
-	if (attr != NULL) {
-		attr++;
-		dbg("attribute='%s'", attr);
-		return attr;
-	}
-
 	return NULL;
 }
 
-static int namedev_parse_rules(char *filename)
+static int namedev_parse(const char *filename, void *data)
 {
-	char line[255];
+	char line[LINE_SIZE];
+	char *bufline;
 	int lineno;
 	char *temp;
 	char *temp2;
@@ -158,6 +112,7 @@ static int namedev_parse_rules(char *filename)
 	size_t cur;
 	size_t count;
 	int program_given = 0;
+	int valid;
 	int retval = 0;
 	struct config_device dev;
 
@@ -171,52 +126,78 @@ static int namedev_parse_rules(char *filename)
 	/* loop through the whole file */
 	cur = 0;
 	lineno = 0;
-	while (1) {
-		count = buf_get_line(buf, bufsize, cur);
-
-		strncpy(line, buf + cur, count);
-		line[count] = '\0';
-		temp = line;
-		lineno++;
+	while (cur < bufsize) {
+		unsigned int i, j;
 
+		count = buf_get_line(buf, bufsize, cur);
+		bufline = &buf[cur];
 		cur += count+1;
-		if (cur > bufsize)
-			break;
+		lineno++;
 
-		dbg_parse("read '%s'", temp);
+		if (count >= LINE_SIZE) {
+			info("line too long, rule skipped %s, line %d", filename, lineno);
+			continue;
+		}
 
 		/* eat the whitespace */
-		while (isspace(*temp))
-			++temp;
-
-		/* empty line? */
-		if ((*temp == '\0') || (*temp == '\n'))
+		while ((count > 0) && isspace(bufline[0])) {
+			bufline++;
+			count--;
+		}
+		if (count == 0)
 			continue;
 
 		/* see if this is a comment */
-		if (*temp == COMMENT_CHARACTER)
+		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
 
-		memset(&dev, 0x00, sizeof(struct config_device));
+		/* skip backslash and newline from multi line rules */
+		for (i = j = 0; i < count; i++) {
+			if (bufline[i] == '\\' || bufline[i] == '\n')
+				continue;
+
+			line[j++] = bufline[i];
+		}
+		line[j] = '\0';
+		dbg_parse("read '%s'", line);
 
 		/* get all known keys */
+		memset(&dev, 0x00, sizeof(struct config_device));
+		temp = line;
+		valid = 0;
+
 		while (1) {
 			retval = parse_get_pair(&temp, &temp2, &temp3);
 			if (retval)
 				break;
 
+			if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
+				strfieldcpy(dev.kernel, temp3);
+				valid = 1;
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_SUBSYSTEM) == 0) {
+				strfieldcpy(dev.subsystem, temp3);
+				valid = 1;
+				continue;
+			}
+
 			if (strcasecmp(temp2, FIELD_BUS) == 0) {
 				strfieldcpy(dev.bus, temp3);
+				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_ID) == 0) {
 				strfieldcpy(dev.id, temp3);
+				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_PLACE) == 0) {
 				strfieldcpy(dev.place, temp3);
+				valid = 1;
 				continue;
 			}
 
@@ -241,54 +222,86 @@ static int namedev_parse_rules(char *filename)
 					}
 					strfieldcpy(pair->file, attr);
 					strfieldcpy(pair->value, temp3);
+					valid = 1;
 				}
 				continue;
 			}
 
-			if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
-				strfieldcpy(dev.kernel, temp3);
+			if (strcasecmp(temp2, FIELD_DRIVER) == 0) {
+				strfieldcpy(dev.driver, temp3);
+				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_PROGRAM) == 0) {
 				program_given = 1;
 				strfieldcpy(dev.program, temp3);
+				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_RESULT) == 0) {
 				strfieldcpy(dev.result, temp3);
+				valid = 1;
 				continue;
 			}
 
 			if (strncasecmp(temp2, FIELD_NAME, sizeof(FIELD_NAME)-1) == 0) {
 				attr = get_key_attribute(temp2 + sizeof(FIELD_NAME)-1);
-				if (attr != NULL)
-					if (strcasecmp(attr, ATTR_PARTITIONS) == 0) {
+				/* FIXME: remove old style options and make OPTIONS= mandatory */
+				if (attr != NULL) {
+					if (strstr(attr, ATTR_PARTITIONS) != NULL) {
 						dbg_parse("creation of partition nodes requested");
-						dev.partitions = PARTITIONS_COUNT;
+						dev.partitions = DEFAULT_PARTITIONS_COUNT;
 					}
+					if (strstr(attr, ATTR_IGNORE_REMOVE) != NULL) {
+						dbg_parse("remove event should be ignored");
+						dev.ignore_remove = 1;
+					}
+				}
 				strfieldcpy(dev.name, temp3);
+				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_SYMLINK) == 0) {
 				strfieldcpy(dev.symlink, temp3);
+				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_OWNER) == 0) {
 				strfieldcpy(dev.owner, temp3);
+				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_GROUP) == 0) {
 				strfieldcpy(dev.group, temp3);
+				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_MODE) == 0) {
 				dev.mode = strtol(temp3, NULL, 8);
+				valid = 1;
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_OPTIONS) == 0) {
+				if (strstr(temp3, ATTR_IGNORE_DEVICE) != NULL) {
+					dbg_parse("device should be ignored");
+					dev.ignore_device = 1;
+				}
+				if (strstr(temp3, ATTR_IGNORE_REMOVE) != NULL) {
+					dbg_parse("remove event should be ignored");
+					dev.ignore_remove = 1;
+				}
+				if (strstr(temp3, ATTR_PARTITIONS) != NULL) {
+					dbg_parse("creation of partition nodes requested");
+					dev.partitions = DEFAULT_PARTITIONS_COUNT;
+				}
+				valid = 1;
 				continue;
 			}
 
@@ -296,16 +309,20 @@ static int namedev_parse_rules(char *filename)
 			goto error;
 		}
 
+		/* skip line if not any valid key was found */
+		if (!valid)
+			goto error;
+
 		/* simple plausibility checks for given keys */
 		if ((dev.sysfs_pair[0].file[0] == '\0') ^
 		    (dev.sysfs_pair[0].value[0] == '\0')) {
-			dbg("inconsistency in " FIELD_SYSFS " key");
+			info("inconsistency in " FIELD_SYSFS " key");
 			goto error;
 		}
 
 		if ((dev.result[0] != '\0') && (program_given == 0)) {
-			dbg(FIELD_RESULT " is only useful when "
-			    FIELD_PROGRAM " is called in any rule before");
+			info(FIELD_RESULT " is only useful when "
+			     FIELD_PROGRAM " is called in any rule before");
 			goto error;
 		}
 
@@ -316,8 +333,8 @@ static int namedev_parse_rules(char *filename)
 			dbg("add_config_dev returned with error %d", retval);
 			continue;
 error:
-			dbg("%s:%d:%d: parse error, rule skipped",
-			    filename, lineno, temp - line);
+			info("parse error %s, line %d:%d, rule skipped",
+			     filename, lineno, temp - line);
 		}
 	}
 
@@ -325,179 +342,29 @@ error:
 	return retval;
 }
 
-static int namedev_parse_permissions(char *filename)
+int namedev_init(void)
 {
-	char line[255];
-	char *temp;
-	char *temp2;
-	char *buf;
-	size_t bufsize;
-	size_t cur;
-	size_t count;
-	int retval = 0;
-	struct perm_device dev;
+	struct stat stats;
+	int retval;
 
-	if (file_map(filename, &buf, &bufsize) == 0) {
-		dbg("reading '%s' as permissions file", filename);
-	} else {
-		dbg("can't open '%s' as permissions file", filename);
+	if (stat(udev_rules_filename, &stats) != 0)
 		return -1;
-	}
-
-	/* loop through the whole file */
-	cur = 0;
-	while (1) {
-		count = buf_get_line(buf, bufsize, cur);
-
-		strncpy(line, buf + cur, count);
-		line[count] = '\0';
-		temp = line;
-
-		cur += count+1;
-		if (cur > bufsize)
-			break;
-
-		dbg_parse("read '%s'", temp);
-
-		/* eat the whitespace at the beginning of the line */
-		while (isspace(*temp))
-			++temp;
-
-		/* empty line? */
-		if ((*temp == '\0') || (*temp == '\n'))
-			continue;
-
-		/* see if this is a comment */
-		if (*temp == COMMENT_CHARACTER)
-			continue;
-
-		memset(&dev, 0x00, sizeof(dev));
-
-		/* parse the line */
-		temp2 = strsep(&temp, ":");
-		if (!temp2) {
-			dbg("cannot parse line '%s'", line);
-			continue;
-		}
-		strfieldcpy(dev.name, temp2);
-
-		temp2 = strsep(&temp, ":");
-		if (!temp2) {
-			dbg("cannot parse line '%s'", line);
-			continue;
-		}
-		strfieldcpy(dev.owner, temp2);
-
-		temp2 = strsep(&temp, ":");
-		if (!temp2) {
-			dbg("cannot parse line '%s'", line);
-			continue;
-		}
-		strfieldcpy(dev.group, temp2);
-
-		if (!temp) {
-			dbg("cannot parse line '%s'", line);
-			continue;
-		}
-		dev.mode = strtol(temp, NULL, 8);
-
-		dbg_parse("name='%s', owner='%s', group='%s', mode=%#o",
-			  dev.name, dev.owner, dev.group, dev.mode);
 
-		retval = add_perm_dev(&dev);
-		if (retval) {
-			dbg("add_perm_dev returned with error %d", retval);
-			goto exit;
-		}
-	}
+	if ((stats.st_mode & S_IFMT) != S_IFDIR)
+		retval = namedev_parse(udev_rules_filename, NULL);
+	else
+		retval = call_foreach_file(namedev_parse, udev_rules_filename, RULEFILE_SUFFIX, NULL);
 
-exit:
-	file_unmap(buf, bufsize);
 	return retval;
 }
 
-struct files {
-	struct list_head list;
-	char name[NAME_SIZE];
-};
-
-/* sort files in lexical order */
-static int file_list_insert(char *filename)
-{
-	struct files *loop_file;
-	struct files *new_file;
-
-	list_for_each_entry(loop_file, &file_list, list) {
-		if (strcmp(loop_file->name, filename) > 0) {
-			break;
-		}
-	}
-
-	new_file = malloc(sizeof(struct files));
-	if (new_file == NULL) {
-		dbg("error malloc");
-		return -ENOMEM;
-	}
-
-	strfieldcpy(new_file->name, filename);
-	list_add_tail(&new_file->list, &loop_file->list);
-	return 0;
-}
-
-/* calls function for file or every file found in directory */
-static int call_foreach_file(int parser (char *f) , char *filename, char *extension)
+void namedev_close(void)
 {
-	struct dirent *ent;
-	DIR *dir;
-	char *ext;
-	char file[NAME_SIZE];
-	struct stat stats;
-	struct files *loop_file;
-	struct files *tmp_file;
-
-	/* look if we have a plain file or a directory to scan */
-	stat(filename, &stats);
-	if ((stats.st_mode & S_IFMT) != S_IFDIR)
-		return parser(filename);
-
-	/* sort matching filename into list */
-	dbg("open config as directory '%s'", filename);
-	dir = opendir(filename);
-	while (1) {
-		ent = readdir(dir);
-		if (ent == NULL || ent->d_name[0] == '\0')
-			break;
-
-		dbg("found file '%s'", ent->d_name);
-		ext = strrchr(ent->d_name, '.');
-		if (ext == NULL)
-			continue;
-
-		if (strcmp(ext, extension) == 0) {
-			dbg("put file in list '%s'", ent->d_name);
-			file_list_insert(ent->d_name);
-		}
-	}
+	struct config_device *dev;
 
-	/* parse every file in the list */
-	list_for_each_entry_safe(loop_file, tmp_file, &file_list, list) {
-		strfieldcpy(file, filename);
-		strfieldcat(file, loop_file->name);
-		parser(file);
-		list_del(&loop_file->list);
-		free(loop_file);
+	list_for_each_entry(dev, &config_device_list, node) {
+		list_del(&dev->node);
+		free(dev);
 	}
-
-	closedir(dir);
-	return 0;
-}
-
-int namedev_init_rules()
-{
-	return call_foreach_file(namedev_parse_rules, udev_rules_filename, RULEFILE_EXT);
 }
 
-int namedev_init_permissions()
-{
-	return call_foreach_file(namedev_parse_permissions, udev_permissions_filename, PERMFILE_EXT);
-}