X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev_parse.c;h=defb698b26ed5962eeeb4590fd7e1c892f527a21;hp=02ffb0a3e70def31d4221dd8214b973eca07f799;hb=ebc39fefd5cb8249cd09d4b3d1b8c72c9e48bab1;hpb=13148857cb880c421711db60ad1785ed8e373906

diff --git a/namedev_parse.c b/namedev_parse.c
index 02ffb0a3e..defb698b2 100644
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -3,7 +3,7 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *
  *	This program is free software; you can redistribute it and/or modify it
@@ -21,8 +21,10 @@
  *
  */
 
-/* define this to enable parsing debugging */
+#ifdef DEBUG
+/* define this to enable parsing debugging also */
 /* #define DEBUG_PARSER */
+#endif
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -31,11 +33,16 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <sys/stat.h>
+#include <dirent.h>
 #include <errno.h>
 
 #include "udev.h"
+#include "logging.h"
 #include "namedev.h"
 
+LIST_HEAD(file_list);
+
 static int add_config_dev(struct config_device *new_dev)
 {
 	struct config_device *tmp_dev;
@@ -49,80 +56,22 @@ static int add_config_dev(struct config_device *new_dev)
 	return 0;
 }
 
-int get_pair(char **orig_string, char **left, char **right)
-{
-	char *temp;
-	char *string = *orig_string;
-
-	if (!string)
-		return -ENODEV;
-
-	/* eat any whitespace */
-	while (isspace(*string) || *string == ',')
-		++string;
-
-	/* split based on '=' */
-	temp = strsep(&string, "=");
-	*left = temp;
-	if (!string)
-		return -ENODEV;
-
-	/* take the right side and strip off the '"' */
-	while (isspace(*string))
-		++string;
-	if (*string == '"')
-		++string;
-	else
-		return -ENODEV;
-
-	temp = strsep(&string, "\"");
-	if (!string || *temp == '\0')
-		return -ENODEV;
-	*right = temp;
-	*orig_string = string;
-	
-	return 0;
-}
-
 void dump_config_dev(struct config_device *dev)
 {
-	switch (dev->type) {
-	case KERNEL_NAME:
-		dbg_parse("KERNEL name='%s'", dev->name);
-		break;
-	case LABEL:
-		dbg_parse("LABEL name='%s', bus='%s', sysfs_file[0]='%s', sysfs_value[0]='%s'",
-			  dev->name, dev->bus, dev->sysfs_pair[0].file, dev->sysfs_pair[0].value);
-		break;
-	case NUMBER:
-		dbg_parse("NUMBER name='%s', bus='%s', id='%s'",
-			  dev->name, dev->bus, dev->id);
-		break;
-	case TOPOLOGY:
-		dbg_parse("TOPOLOGY name='%s', bus='%s', place='%s'",
-			  dev->name, dev->bus, dev->place);
-		break;
-	case REPLACE:
-		dbg_parse("REPLACE name=%s, kernel_name=%s",
-			  dev->name, dev->kernel_name);
-		break;
-	case CALLOUT:
-		dbg_parse("CALLOUT name='%s', bus='%s', program='%s', id='%s'",
-			  dev->name, dev->bus, dev->exec_program, dev->id);
-		break;
-	default:
-		dbg_parse("unknown type of method");
-	}
+	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'",
+		  dev->name, dev->symlink, dev->bus, dev->place, dev->id,
+		  dev->sysfs_pair[0].file, dev->sysfs_pair[0].value,
+		  dev->kernel, dev->program, dev->result);
 }
 
 void dump_config_dev_list(void)
 {
-	struct list_head *tmp;
+	struct config_device *dev;
 
-	list_for_each(tmp, &config_device_list) {
-		struct config_device *dev = list_entry(tmp, struct config_device, node);
+	list_for_each_entry(dev, &config_device_list, node)
 		dump_config_dev(dev);
-	}
 }
 
 void dump_perm_dev(struct perm_device *dev)
@@ -133,31 +82,59 @@ void dump_perm_dev(struct perm_device *dev)
 
 void dump_perm_dev_list(void)
 {
-	struct list_head *tmp;
+	struct perm_device *dev;
 
-	list_for_each(tmp, &perm_device_list) {
-		struct perm_device *dev = list_entry(tmp, struct perm_device, node);
+	list_for_each_entry(dev, &perm_device_list, node)
 		dump_perm_dev(dev);
-	}
 }
 
+/* extract possible KEY{attr} or KEY_attr */
+static char *get_key_attribute(char *str)
+{
+	char *pos;
+	char *attr;
+
+	attr = strchr(str, '{');
+	if (attr != NULL) {
+		attr++;
+		pos = strchr(attr, '}');
+		if (pos == NULL) {
+			dbg("missing closing brace for format");
+			return NULL;
+		}
+		pos[0] = '\0';
+		dbg("attribute='%s'", attr);
+		return attr;
+	}
+
+	attr = strchr(str, '_');
+	if (attr != NULL) {
+		attr++;
+		dbg("attribute='%s'", attr);
+		return attr;
+	}
+
+	return NULL;
+}
 
-int namedev_init_rules(void)
+static int namedev_parse_rules(char *filename)
 {
 	char line[255];
 	int lineno;
 	char *temp;
 	char *temp2;
 	char *temp3;
+	char *attr;
 	FILE *fd;
+	int program_given = 0;
 	int retval = 0;
 	struct config_device dev;
 
-	fd = fopen(udev_rules_filename, "r");
+	fd = fopen(filename, "r");
 	if (fd != NULL) {
-		dbg("reading '%s' as rules file", udev_rules_filename);
+		dbg("reading '%s' as rules file", filename);
 	} else {
-		dbg("can't open '%s' as a rules file", udev_rules_filename);
+		dbg("can't open '%s' as a rules file", filename);
 		return -ENODEV;
 	}
 
@@ -185,40 +162,9 @@ int namedev_init_rules(void)
 
 		memset(&dev, 0x00, sizeof(struct config_device));
 
-		/* get the method */
-		temp2 = strsep(&temp, ",");
-
-		if (strcasecmp(temp2, TYPE_LABEL) == 0) {
-			dev.type = LABEL;
-			goto keys;
-		}
-
-		if (strcasecmp(temp2, TYPE_NUMBER) == 0) {
-			dev.type = NUMBER;
-			goto keys;
-		}
-
-		if (strcasecmp(temp2, TYPE_TOPOLOGY) == 0) {
-			dev.type = TOPOLOGY;
-			goto keys;
-		}
-
-		if (strcasecmp(temp2, TYPE_REPLACE) == 0) {
-			dev.type = REPLACE;
-			goto keys;
-		}
-
-		if (strcasecmp(temp2, TYPE_CALLOUT) == 0) {
-			dev.type = CALLOUT;
-			goto keys;
-		}
-
-		dbg_parse("unknown type of method '%s'", temp2);
-		goto error;
-keys:
 		/* get all known keys */
 		while (1) {
-			retval = get_pair(&temp, &temp2, &temp3);
+			retval = parse_get_pair(&temp, &temp2, &temp3);
 			if (retval)
 				break;
 
@@ -251,24 +197,40 @@ keys:
 					++pair;
 				}
 				if (pair) {
-					/* remove prepended 'SYSFS_' */
-					strfieldcpy(pair->file, temp2 + sizeof(FIELD_SYSFS)-1);
+					attr = get_key_attribute(temp2 + sizeof(FIELD_SYSFS)-1);
+					if (attr == NULL) {
+						dbg("error parsing " FIELD_SYSFS " attribute");
+						continue;
+					}
+					strfieldcpy(pair->file, attr);
 					strfieldcpy(pair->value, temp3);
 				}
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
-				strfieldcpy(dev.kernel_name, temp3);
+				strfieldcpy(dev.kernel, temp3);
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_PROGRAM) == 0) {
-				strfieldcpy(dev.exec_program, temp3);
+				program_given = 1;
+				strfieldcpy(dev.program, temp3);
 				continue;
 			}
 
-			if (strcasecmp(temp2, FIELD_NAME) == 0) {
+			if (strcasecmp(temp2, FIELD_RESULT) == 0) {
+				strfieldcpy(dev.result, temp3);
+				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) {
+						dbg_parse("creation of partition nodes requested");
+						dev.partitions = PARTITIONS_COUNT;
+					}
 				strfieldcpy(dev.name, temp3);
 				continue;
 			}
@@ -278,75 +240,41 @@ keys:
 				continue;
 			}
 
-			dbg_parse("unknown type of field '%s'", temp2);
+			dbg("unknown type of field '%s'", temp2);
+			dbg("You might be using a rules file in the old format, please fix.");
+			goto error;
+		}
+
+		/* simple plausibility check for given keys */
+		if ((dev.sysfs_pair[0].file[0] == '\0') ^
+		    (dev.sysfs_pair[0].value[0] == '\0')) {
+			dbg("inconsistency in " FIELD_SYSFS " key");
+			goto error;
 		}
 
-		/* check presence of keys according to method type */
-		switch (dev.type) {
-		case LABEL:
-			dbg_parse(TYPE_LABEL " name='%s', bus='%s', "
-				  "sysfs_file[0]='%s', sysfs_value[0]='%s', symlink='%s'",
-				  dev.name, dev.bus, dev.sysfs_pair[0].file,
-				  dev.sysfs_pair[0].value, dev.symlink);
-			if ((*dev.name == '\0') ||
-			    (*dev.sysfs_pair[0].file == '\0') ||
-			    (*dev.sysfs_pair[0].value == '\0'))
-				goto error;
-			break;
-		case NUMBER:
-			dbg_parse(TYPE_NUMBER " name='%s', bus='%s', id='%s', symlink='%s'",
-				  dev.name, dev.bus, dev.id, dev.symlink);
-			if ((*dev.name == '\0') ||
-			    (*dev.bus == '\0') ||
-			    (*dev.id == '\0'))
-				goto error;
-			break;
-		case TOPOLOGY:
-			dbg_parse(TYPE_TOPOLOGY " name='%s', bus='%s', "
-				  "place='%s', symlink='%s'",
-				  dev.name, dev.bus, dev.place, dev.symlink);
-			if ((*dev.name == '\0') ||
-			    (*dev.bus == '\0') ||
-			    (*dev.place == '\0'))
-				goto error;
-			break;
-		case REPLACE:
-			dbg_parse(TYPE_REPLACE " name='%s', kernel_name='%s', symlink='%s'",
-				  dev.name, dev.kernel_name, dev.symlink);
-			if ((*dev.name == '\0') ||
-			    (*dev.kernel_name == '\0'))
-				goto error;
-			break;
-		case CALLOUT:
-			dbg_parse(TYPE_CALLOUT " name='%s', bus='%s', program='%s', "
-				  "id='%s', symlink='%s'",
-				  dev.name, dev.bus, dev.exec_program,
-				  dev.id, dev.symlink);
-			if ((*dev.name == '\0') ||
-			    (*dev.id == '\0') ||
-			    (*dev.exec_program == '\0'))
-				goto error;
-			break;
-		default:
-			dbg_parse("unknown type of method");
+		if ((dev.result[0] != '\0') && (program_given == 0)) {
+			dbg(FIELD_RESULT " is only useful when "
+			    FIELD_PROGRAM " is called in any rule before");
 			goto error;
 		}
 
+		dev.config_line = lineno;
+		strfieldcpy(dev.config_file, filename);
 		retval = add_config_dev(&dev);
 		if (retval) {
 			dbg("add_config_dev returned with error %d", retval);
 			continue;
+error:
+			dbg("%s:%d:%d: parse error, rule skipped",
+			    filename, lineno, temp - line);
 		}
 	}
-error:
-	dbg_parse("%s:%d:%Zd: field missing or parse error", udev_rules_filename,
-		  lineno, temp - line);
 exit:
 	fclose(fd);
 	return retval;
 }
 
-int namedev_init_permissions(void)
+static int namedev_parse_permissions(char *filename)
 {
 	char line[255];
 	char *temp;
@@ -355,11 +283,11 @@ int namedev_init_permissions(void)
 	int retval = 0;
 	struct perm_device dev;
 
-	fd = fopen(udev_permissions_filename, "r");
+	fd = fopen(filename, "r");
 	if (fd != NULL) {
-		dbg("reading '%s' as permissions file", udev_permissions_filename);
+		dbg("reading '%s' as permissions file", filename);
 	} else {
-		dbg("can't open '%s' as permissions file", udev_permissions_filename);
+		dbg("can't open '%s' as permissions file", filename);
 		return -ENODEV;
 	}
 
@@ -391,21 +319,21 @@ int namedev_init_permissions(void)
 			dbg("cannot parse line '%s'", line);
 			continue;
 		}
-		strncpy(dev.name, temp2, sizeof(dev.name));
+		strfieldcpy(dev.name, temp2);
 
 		temp2 = strsep(&temp, ":");
 		if (!temp2) {
 			dbg("cannot parse line '%s'", line);
 			continue;
 		}
-		strncpy(dev.owner, temp2, sizeof(dev.owner));
+		strfieldcpy(dev.owner, temp2);
 
 		temp2 = strsep(&temp, ":");
 		if (!temp2) {
 			dbg("cannot parse line '%s'", line);
 			continue;
 		}
-		strncpy(dev.group, temp2, sizeof(dev.owner));
+		strfieldcpy(dev.group, temp2);
 
 		if (!temp) {
 			dbg("cannot parse line: %s", line);
@@ -426,6 +354,90 @@ int namedev_init_permissions(void)
 exit:
 	fclose(fd);
 	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)
+{
+	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);
+		}
+	}
 
+	/* 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);
+	}
+
+	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);
+}