X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev_parse.c;h=3be408932bc93edbc82485357b86928dbe9ff793;hp=e6575fa108431958e33d0a283b2c7bd20935f4ba;hb=882af735ec18cb4e6ba6f59ca60f8266cc96c330;hpb=274812b502089c55acb1bc7bfe99bebf9ce669b2

diff --git a/namedev_parse.c b/namedev_parse.c
index e6575fa10..3be408932 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
@@ -30,15 +31,19 @@
 #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_libc_wrapper.h"
 #include "udev.h"
+#include "udev_utils.h"
 #include "logging.h"
 #include "namedev.h"
 
+LIST_HEAD(config_device_list);
+
 static int add_config_dev(struct config_device *new_dev)
 {
 	struct config_device *tmp_dev;
@@ -54,13 +59,14 @@ static int add_config_dev(struct config_device *new_dev)
 
 void dump_config_dev(struct config_device *dev)
 {
-	/*FIXME dump all sysfs's */
-	dbg_parse("name='%s', symlink='%s', bus='%s', place='%s', id='%s', "
+	dbg_parse("name='%s', symlink='%s', bus='%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,
+		  "kernel='%s', program='%s', result='%s'"
+		  "owner='%s', group='%s', mode=%#o",
+		  dev->name, dev->symlink, dev->bus, dev->id,
 		  dev->sysfs_pair[0].file, dev->sysfs_pair[0].value,
-		  dev->kernel, dev->program, dev->result);
+		  dev->kernel, dev->program, dev->result,
+		  dev->owner, dev->group, dev->mode);
 }
 
 void dump_config_dev_list(void)
@@ -71,82 +77,122 @@ void dump_config_dev_list(void)
 		dump_config_dev(dev);
 }
 
-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)
+/* extract possible KEY{attr} */
+static char *get_key_attribute(char *str)
 {
-	struct perm_device *dev;
+	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;
+	}
 
-	list_for_each_entry(dev, &perm_device_list, node)
-		dump_perm_dev(dev);
+	return NULL;
 }
 
-int namedev_init_rules(void)
+static int namedev_parse(struct udevice *udev, const 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) {
+		unsigned int i, j;
+
+		count = buf_get_line(buf, bufsize, cur);
+		bufline = &buf[cur];
+		cur += count+1;
 		lineno++;
-		dbg_parse("read '%s'", temp);
 
-		/* eat the whitespace */
-		while (isspace(*temp))
-			++temp;
+		if (count >= sizeof(line)) {
+			info("line too long, rule skipped %s, line %d", filename, lineno);
+			continue;
+		}
 
-		/* empty line? */
-		if ((*temp == '\0') || (*temp == '\n'))
+		/* 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(struct config_device));
+		/* skip backslash and newline from multi line rules */
+		for (i = j = 0; i < count; i++) {
+			if (bufline[i] == '\\' && bufline[i+1] == '\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_BUS) == 0) {
-				strfieldcpy(dev.bus, temp3);
+			if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
+				strlcpy(dev.kernel, temp3, sizeof(dev.kernel));
+				valid = 1;
 				continue;
 			}
 
-			if (strcasecmp(temp2, FIELD_ID) == 0) {
-				strfieldcpy(dev.id, temp3);
+			if (strcasecmp(temp2, FIELD_SUBSYSTEM) == 0) {
+				strlcpy(dev.subsystem, temp3, sizeof(dev.subsystem));
+				valid = 1;
 				continue;
 			}
 
-			if (strcasecmp(temp2, FIELD_PLACE) == 0) {
-				strfieldcpy(dev.place, temp3);
+			if (strcasecmp(temp2, FIELD_BUS) == 0) {
+				strlcpy(dev.bus, temp3, sizeof(dev.bus));
+				valid = 1;
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_ID) == 0) {
+				strlcpy(dev.id, temp3, sizeof(dev.id));
+				valid = 1;
 				continue;
 			}
 
@@ -164,150 +210,160 @@ int namedev_init_rules(void)
 					++pair;
 				}
 				if (pair) {
-					/* remove prepended 'SYSFS_' */
-					strfieldcpy(pair->file, temp2 + sizeof(FIELD_SYSFS)-1);
-					strfieldcpy(pair->value, temp3);
+					attr = get_key_attribute(temp2 + sizeof(FIELD_SYSFS)-1);
+					if (attr == NULL) {
+						dbg("error parsing " FIELD_SYSFS " attribute");
+						continue;
+					}
+					strlcpy(pair->file, attr, sizeof(pair->file));
+					strlcpy(pair->value, temp3, sizeof(pair->value));
+					valid = 1;
 				}
 				continue;
 			}
 
-			if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
-				strfieldcpy(dev.kernel, temp3);
+			if (strcasecmp(temp2, FIELD_DRIVER) == 0) {
+				strlcpy(dev.driver, temp3, sizeof(dev.driver));
+				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_PROGRAM) == 0) {
 				program_given = 1;
-				strfieldcpy(dev.program, temp3);
+				strlcpy(dev.program, temp3, sizeof(dev.program));
+				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_RESULT) == 0) {
-				strfieldcpy(dev.result, temp3);
+				strlcpy(dev.result, temp3, sizeof(dev.result));
+				valid = 1;
 				continue;
 			}
 
-			if (strcasecmp(temp2, FIELD_NAME) == 0) {
-				strfieldcpy(dev.name, temp3);
+			if (strncasecmp(temp2, FIELD_NAME, sizeof(FIELD_NAME)-1) == 0) {
+				attr = get_key_attribute(temp2 + sizeof(FIELD_NAME)-1);
+				/* FIXME: remove old style options and make OPTIONS= mandatory */
+				if (attr != NULL) {
+					if (strstr(attr, OPTION_PARTITIONS) != NULL) {
+						dbg_parse("creation of partition nodes requested");
+						dev.partitions = DEFAULT_PARTITIONS_COUNT;
+					}
+					if (strstr(attr, OPTION_IGNORE_REMOVE) != NULL) {
+						dbg_parse("remove event should be ignored");
+						dev.ignore_remove = 1;
+					}
+				}
+				if (temp3[0] != '\0')
+					strlcpy(dev.name, temp3, sizeof(dev.name));
+				else
+					dev.ignore_device = 1;
+				valid = 1;
 				continue;
 			}
 
 			if (strcasecmp(temp2, FIELD_SYMLINK) == 0) {
-				strfieldcpy(dev.symlink, temp3);
+				strlcpy(dev.symlink, temp3, sizeof(dev.symlink));
+				valid = 1;
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_OWNER) == 0) {
+				strlcpy(dev.owner, temp3, sizeof(dev.owner));
+				valid = 1;
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_GROUP) == 0) {
+				strlcpy(dev.group, temp3, sizeof(dev.group));
+				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, OPTION_IGNORE_DEVICE) != NULL) {
+					dbg_parse("device should be ignored");
+					dev.ignore_device = 1;
+				}
+				if (strstr(temp3, OPTION_IGNORE_REMOVE) != NULL) {
+					dbg_parse("remove event should be ignored");
+					dev.ignore_remove = 1;
+				}
+				if (strstr(temp3, OPTION_PARTITIONS) != NULL) {
+					dbg_parse("creation of partition nodes requested");
+					dev.partitions = DEFAULT_PARTITIONS_COUNT;
+				}
+				valid = 1;
 				continue;
 			}
 
 			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 */
+		/* 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 SYSFS_ key");
+			info("inconsistency in " FIELD_SYSFS " key");
 			goto error;
 		}
 
 		if ((dev.result[0] != '\0') && (program_given == 0)) {
-			dbg("RESULT is only useful when PROGRAM called in any rule before");
+			info(FIELD_RESULT " is only useful when "
+			     FIELD_PROGRAM " is called in any rule before");
 			goto error;
 		}
 
 		dev.config_line = lineno;
+		strlcpy(dev.config_file, filename, sizeof(dev.config_file));
 		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",
-				  udev_rules_filename, lineno, temp - line);
+			info("parse error %s, line %d:%d, rule skipped",
+			     filename, lineno, (int) (temp - line));
 		}
 	}
-exit:
-	fclose(fd);
+
+	file_unmap(buf, bufsize);
 	return retval;
 }
 
-int namedev_init_permissions(void)
+int namedev_init(void)
 {
-	char line[255];
-	char *temp;
-	char *temp2;
-	FILE *fd;
-	int retval = 0;
-	struct perm_device dev;
-
-	fd = fopen(udev_permissions_filename, "r");
-	if (fd != NULL) {
-		dbg("reading '%s' as permissions file", udev_permissions_filename);
-	} else {
-		dbg("can't open '%s' as permissions file", udev_permissions_filename);
-		return -ENODEV;
-	}
-
-	/* loop through the whole file */
-	while (1) {
-		temp = fgets(line, sizeof(line), fd);
-		if (temp == NULL)
-			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;
+	struct stat stats;
+	int retval;
 
-		/* 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;
-		}
-		strncpy(dev.name, temp2, sizeof(dev.name));
+	if (stat(udev_rules_filename, &stats) != 0)
+		return -1;
 
-		temp2 = strsep(&temp, ":");
-		if (!temp2) {
-			dbg("cannot parse line '%s'", line);
-			continue;
-		}
-		strncpy(dev.owner, temp2, sizeof(dev.owner));
+	if ((stats.st_mode & S_IFMT) != S_IFDIR)
+		retval = namedev_parse(NULL, udev_rules_filename);
+	else
+		retval = call_foreach_file(namedev_parse, NULL, udev_rules_filename, RULEFILE_SUFFIX);
 
-		temp2 = strsep(&temp, ":");
-		if (!temp2) {
-			dbg("cannot parse line '%s'", line);
-			continue;
-		}
-		strncpy(dev.group, temp2, sizeof(dev.group));
+	return retval;
+}
 
-		if (!temp) {
-			dbg("cannot parse line: %s", line);
-			continue;
-		}
-		dev.mode = strtol(temp, NULL, 8);
+void namedev_close(void)
+{
+	struct config_device *dev;
+	struct config_device *temp_dev;
 
-		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;
-		}
+	list_for_each_entry_safe(dev, temp_dev, &config_device_list, node) {
+		list_del(&dev->node);
+		free(dev);
 	}
-
-exit:
-	fclose(fd);
-	return retval;
 }