X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev_parse.c;h=22e3523f3d8b67c474d245a15359f2d1e2157993;hp=3578058a768c1fe0f66549d4dd72b071549fed11;hb=e5e2ea95a4b21ebc5297881e7e8c5ab4425bac5e;hpb=d94df232423870641132b307d74281f692219730

diff --git a/namedev_parse.c b/namedev_parse.c
index 3578058a7..22e3523f3 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,95 +21,82 @@
  *
  */
 
-/* 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>
 #include <string.h>
 #include <stdio.h>
-#include <fcntl.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <sys/stat.h>
 #include <errno.h>
 
 #include "udev.h"
+#include "udev_lib.h"
+#include "logging.h"
 #include "namedev.h"
 
-int get_pair(char **orig_string, char **left, char **right)
+
+static int add_config_dev(struct config_device *new_dev)
 {
-	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;
-	
+	struct config_device *tmp_dev;
+
+	tmp_dev = malloc(sizeof(*tmp_dev));
+	if (tmp_dev == NULL)
+		return -ENOMEM;
+	memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
+	list_add_tail(&tmp_dev->node, &config_device_list);
+	//dump_config_dev(tmp_dev);
 	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='%s', sysfs_value='%s'",
-			  dev->name, dev->bus, dev->sysfs_file, dev->sysfs_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'"
+		  "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,
+		  dev->kernel, dev->program, dev->result,
+		  dev->owner, dev->group, dev->mode);
 }
 
 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);
+}
+
+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)
@@ -120,277 +107,328 @@ 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;
+	}
 
-int namedev_init_rules(void)
+	attr = strchr(str, '_');
+	if (attr != NULL) {
+		attr++;
+		dbg("attribute='%s'", attr);
+		return attr;
+	}
+
+	return NULL;
+}
+
+static int namedev_parse_rules(char *filename)
 {
-	char line[255];
+	char line[LINE_SIZE];
+	char *bufline;
 	int lineno;
 	char *temp;
 	char *temp2;
 	char *temp3;
-	FILE *fd;
+	char *attr;
+	char *buf;
+	size_t bufsize;
+	size_t cur;
+	size_t count;
+	int program_given = 0;
+	int valid;
 	int retval = 0;
 	struct config_device dev;
 
-	fd = fopen(udev_rules_filename, "r");
-	if (fd != NULL) {
-		dbg("reading '%s' as rules file", udev_rules_filename);
+	if (file_map(filename, &buf, &bufsize) == 0) {
+		dbg("reading '%s' as rules file", filename);
 	} else {
-		dbg("can't open '%s' as a rules file", udev_rules_filename);
-		return -ENODEV;
+		dbg("can't open '%s' as rules file", filename);
+		return -1;
 	}
 
 	/* loop through the whole file */
+	cur = 0;
 	lineno = 0;
-	while (1) {
-		/* get a line */
-		temp = fgets(line, sizeof(line), fd);
-		if (temp == NULL)
-			goto exit;
+	while (cur < bufsize) {
+		count = buf_get_line(buf, bufsize, cur);
+		bufline = &buf[cur];
+		cur += count+1;
 		lineno++;
-		dbg_parse("read '%s'", temp);
-
-		/* empty line? */
-		if (*temp == 0x00)
-			continue;
 
-		/* see if this is a comment */
-		if (*temp == COMMENT_CHARACTER)
+		if (count >= LINE_SIZE) {
+			info("line too long, rule skipped %s, line %d",
+			     filename, lineno);
 			continue;
-
-		/* eat the whitespace */
-		while (isspace(*temp))
-			++temp;
-
-		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;
+		/* eat the whitespace */
+		while ((count > 0) && isspace(bufline[0])) {
+			bufline++;
+			count--;
 		}
+		if (count == 0)
+			continue;
 
-		if (strcasecmp(temp2, TYPE_REPLACE) == 0) {
-			dev.type = REPLACE;
-			goto keys;
-		}
+		/* see if this is a comment */
+		if (bufline[0] == COMMENT_CHARACTER)
+			continue;
 
-		if (strcasecmp(temp2, TYPE_CALLOUT) == 0) {
-			dev.type = CALLOUT;
-			goto keys;
-		}
+		strncpy(line, bufline, count);
+		line[count] = '\0';
+		dbg_parse("read '%s'", line);
 
-		dbg_parse("unknown type of method '%s'", temp2);
-		goto error;
-keys:
 		/* get all known keys */
+		memset(&dev, 0x00, sizeof(struct config_device));
+		temp = line;
+		valid = 0;
+
 		while (1) {
-			retval = get_pair(&temp, &temp2, &temp3);
+			retval = parse_get_pair(&temp, &temp2, &temp3);
 			if (retval)
 				break;
 
 			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;
 			}
 
 			if (strncasecmp(temp2, FIELD_SYSFS, sizeof(FIELD_SYSFS)-1) == 0) {
-				/* remove prepended 'SYSFS_' */
-				strfieldcpy(dev.sysfs_file, temp2 + sizeof(FIELD_SYSFS)-1);
-				strfieldcpy(dev.sysfs_value, temp3);
+				struct sysfs_pair *pair = &dev.sysfs_pair[0];
+				int sysfs_pair_num = 0;
+
+				/* find first unused pair */
+				while (pair->file[0] != '\0') {
+					++sysfs_pair_num;
+					if (sysfs_pair_num >= MAX_SYSFS_PAIRS) {
+						pair = NULL;
+						break;
+					}
+					++pair;
+				}
+				if (pair) {
+					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);
+					valid = 1;
+				}
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
-				strfieldcpy(dev.kernel_name, temp3);
+				strfieldcpy(dev.kernel, temp3);
+				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_PROGRAM) == 0) {
-				strfieldcpy(dev.exec_program, temp3);
+				program_given = 1;
+				strfieldcpy(dev.program, temp3);
+				valid = 1;
 				continue;
 			}
 
-			if (strcasecmp(temp2, FIELD_NAME) == 0) {
+			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 && strcasecmp(attr, ATTR_PARTITIONS) == 0) {
+						dbg_parse("creation of partition nodes requested");
+						dev.partitions = PARTITIONS_COUNT;
+					}
 				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;
 			}
 
-			dbg_parse("unknown type of field '%s'", temp2);
+			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;
+			}
+
+			dbg("unknown type of field '%s'", temp2);
+			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')) {
+			info("inconsistency in " FIELD_SYSFS " key");
+			goto error;
 		}
 
-		/* check presence of keys according to method type */
-		switch (dev.type) {
-		case LABEL:
-			dbg_parse("LABEL name='%s', bus='%s', "
-				  "sysfs_file='%s', sysfs_value='%s', symlink='%s'",
-				  dev.name, dev.bus, dev.sysfs_file,
-				  dev.sysfs_value, dev.symlink);
-			if ((*dev.name == '\0') ||
-			    (*dev.bus == '\0') ||
-			    (*dev.sysfs_file == '\0') ||
-			    (*dev.sysfs_value == '\0'))
-				goto error;
-			break;
-		case NUMBER:
-			dbg_parse("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("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("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("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.bus == '\0') ||
-			    (*dev.id == '\0') ||
-			    (*dev.exec_program == '\0'))
-				goto error;
-			break;
-		default:
-			dbg_parse("xxx default method");
+		if ((dev.result[0] != '\0') && (program_given == 0)) {
+			info(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:
+			info("parse error %s, line %d:%d, 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);
+
+	file_unmap(buf, bufsize);
 	return retval;
 }
 
-int namedev_init_permissions(void)
+static int namedev_parse_permissions(char *filename)
 {
-	char line[255];
+	char line[LINE_SIZE];
+	char *bufline;
 	char *temp;
 	char *temp2;
-	FILE *fd;
+	char *buf;
+	size_t bufsize;
+	size_t cur;
+	size_t count;
 	int retval = 0;
 	struct perm_device dev;
+	int lineno;
 
-	fd = fopen(udev_permissions_filename, "r");
-	if (fd != NULL) {
-		dbg("reading '%s' as permissions file", udev_permissions_filename);
+	if (file_map(filename, &buf, &bufsize) == 0) {
+		dbg("reading '%s' as permissions file", filename);
 	} else {
-		dbg("can't open '%s' as permissions file", udev_permissions_filename);
-		return -ENODEV;
+		dbg("can't open '%s' as permissions file", filename);
+		return -1;
 	}
 
 	/* loop through the whole file */
-	while (1) {
-		temp = fgets(line, sizeof(line), fd);
-		if (temp == NULL)
-			break;
-
-		dbg_parse("read '%s'", temp);
+	cur = 0;
+	lineno = 0;
+	while (cur < bufsize) {
+		count = buf_get_line(buf, bufsize, cur);
+		bufline = &buf[cur];
+		cur += count+1;
+		lineno++;
 
-		/* eat the whitespace at the beginning of the line */
-		while (isspace(*temp))
-			++temp;
+		if (count >= LINE_SIZE) {
+			info("line too long, rule skipped %s, line %d",
+			     filename, lineno);
+			continue;
+		}
 
-		/* empty line? */
-		if (*temp == 0x00)
+		/* eat the whitespace */
+		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(dev));
+		strncpy(line, bufline, count);
+		line[count] = '\0';
+		dbg_parse("read '%s'", line);
 
 		/* parse the line */
+		memset(&dev, 0x00, sizeof(struct perm_device));
+		temp = line;
+
 		temp2 = strsep(&temp, ":");
 		if (!temp2) {
 			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);
+			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);
+			  dev.name, dev.owner, dev.group, dev.mode);
+
 		retval = add_perm_dev(&dev);
 		if (retval) {
 			dbg("add_perm_dev returned with error %d", retval);
@@ -399,8 +437,30 @@ int namedev_init_permissions(void)
 	}
 
 exit:
-	fclose(fd);
+	file_unmap(buf, bufsize);
 	return retval;
-}	
+}
 
+int namedev_init_rules(void)
+{
+	struct stat stats;
+
+	stat(udev_rules_filename, &stats);
+	if ((stats.st_mode & S_IFMT) != S_IFDIR)
+		return namedev_parse_rules(udev_rules_filename);
+	else
+		return call_foreach_file(namedev_parse_rules,
+					 udev_rules_filename, RULEFILE_SUFFIX);
+}
 
+int namedev_init_permissions(void)
+{
+	struct stat stats;
+
+	stat(udev_permissions_filename, &stats);
+	if ((stats.st_mode & S_IFMT) != S_IFDIR)
+		return namedev_parse_permissions(udev_permissions_filename);
+	else
+		return call_foreach_file(namedev_parse_permissions,
+					 udev_permissions_filename, PERMFILE_SUFFIX);
+}