X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev_parse.c;h=b15be0e6fa7d5894c9c8bc0a3a19f07034300a06;hp=b5d0d64b9da57e97c29edf40e079a9e1f2587d2e;hb=267f534d1c809c31e0dcc9613953ecac45529038;hpb=3d150dfb28efbaf0b25f154fb8955c47d606c3d5

diff --git a/namedev_parse.c b/namedev_parse.c
index b5d0d64b9..b15be0e6f 100644
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -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>
@@ -34,8 +36,22 @@
 #include <errno.h>
 
 #include "udev.h"
+#include "logging.h"
 #include "namedev.h"
 
+static int add_config_dev(struct config_device *new_dev)
+{
+	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;
+}
+
 int get_pair(char **orig_string, char **left, char **right)
 {
 	char *temp;
@@ -45,7 +61,7 @@ int get_pair(char **orig_string, char **left, char **right)
 		return -ENODEV;
 
 	/* eat any whitespace */
-	while (isspace(*string))
+	while (isspace(*string) || *string == ',')
 		++string;
 
 	/* split based on '=' */
@@ -71,58 +87,23 @@ int get_pair(char **orig_string, char **left, char **right)
 	return 0;
 }
 
-static int get_value(const char *left, char **orig_string, char **ret_string)
-{
-	int retval;
-	char *left_string;
-
-	retval = get_pair(orig_string, &left_string, ret_string);
-	if (retval)
-		return retval;
-	if (strcasecmp(left_string, left) != 0)
-		return -ENODEV;
-	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");
-	}
+	/*FIXME dump all sysfs's */
+	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,15 +114,12 @@ 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);
-	}
 }
 
-
 int namedev_init_rules(void)
 {
 	char line[255];
@@ -150,6 +128,7 @@ int namedev_init_rules(void)
 	char *temp2;
 	char *temp3;
 	FILE *fd;
+	int program_given = 0;
 	int retval = 0;
 	struct config_device dev;
 
@@ -169,15 +148,14 @@ int namedev_init_rules(void)
 		if (temp == NULL)
 			goto exit;
 		lineno++;
-
 		dbg_parse("read '%s'", temp);
 
-		/* eat the whitespace at the beginning of the line */
+		/* eat the whitespace */
 		while (isspace(*temp))
 			++temp;
 
 		/* empty line? */
-		if (*temp == 0x00)
+		if ((*temp == '\0') || (*temp == '\n'))
 			continue;
 
 		/* see if this is a comment */
@@ -186,197 +164,105 @@ int namedev_init_rules(void)
 
 		memset(&dev, 0x00, sizeof(struct config_device));
 
-		/* parse the line */
-		temp2 = strsep(&temp, ",");
-		if (strcasecmp(temp2, TYPE_LABEL) == 0) {
-			/* label type */
-			dev.type = LABEL;
-
-			/* BUS="bus" */
-			retval = get_value("BUS", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.bus, temp3);
-
-			/* file="value" */
-			temp2 = strsep(&temp, ",");
+		/* get all known keys */
+		while (1) {
 			retval = get_pair(&temp, &temp2, &temp3);
 			if (retval)
 				break;
-			strfieldcpy(dev.sysfs_file, temp2);
-			strfieldcpy(dev.sysfs_value, temp3);
-
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.name, temp3);
 
-			/* SYMLINK="name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("SYMLINK", &temp, &temp3);
-			if (retval == 0)
+			if (strcasecmp(temp2, FIELD_BUS) == 0) {
+				strfieldcpy(dev.bus, temp3);
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_ID) == 0) {
+				strfieldcpy(dev.id, temp3);
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_PLACE) == 0) {
+				strfieldcpy(dev.place, temp3);
+				continue;
+			}
+
+			if (strncasecmp(temp2, FIELD_SYSFS, sizeof(FIELD_SYSFS)-1) == 0) {
+				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) {
+					/* remove prepended 'SYSFS_' */
+					strfieldcpy(pair->file, temp2 + sizeof(FIELD_SYSFS)-1);
+					strfieldcpy(pair->value, temp3);
+				}
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
+				strfieldcpy(dev.kernel, temp3);
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_PROGRAM) == 0) {
+				program_given = 1;
+				strfieldcpy(dev.program, temp3);
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_RESULT) == 0) {
+				strfieldcpy(dev.result, temp3);
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_NAME) == 0) {
+				strfieldcpy(dev.name, temp3);
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_SYMLINK) == 0) {
 				strfieldcpy(dev.symlink, temp3);
+				continue;
+			}
 
-			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);
+			dbg("unknown type of field '%s'", temp2);
+			dbg("You might be using a rules file in the old format, please fix.");
+			goto error;
 		}
 
-		if (strcasecmp(temp2, TYPE_NUMBER) == 0) {
-			/* number type */
-			dev.type = NUMBER;
-
-			/* BUS="bus" */
-			retval = get_value("BUS", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.bus, temp3);
-
-			/* ID="id" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("ID", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.id, temp3);
-
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.name, temp3);
-
-			/* SYMLINK="name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("SYMLINK", &temp, &temp3);
-			if (retval == 0)
-				strfieldcpy(dev.symlink, temp3);
-
-			dbg_parse("NUMBER name='%s', bus='%s', id='%s', symlink='%s'",
-				  dev.name, dev.bus, dev.id, dev.symlink);
+		/* simple plausibility check for given keys */
+		if ((dev.sysfs_pair[0].file[0] == '\0') ^
+		    (dev.sysfs_pair[0].value[0] == '\0')) {
+			dbg("inconsistency in SYSFS_ key");
+			goto error;
 		}
 
-		if (strcasecmp(temp2, TYPE_TOPOLOGY) == 0) {
-			/* number type */
-			dev.type = TOPOLOGY;
-
-			/* BUS="bus" */
-			retval = get_value("BUS", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.bus, temp3);
-
-			/* PLACE="place" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("PLACE", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.place, temp3);
-
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.name, temp3);
-
-			/* SYMLINK="name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("SYMLINK", &temp, &temp3);
-			if (retval == 0)
-				strfieldcpy(dev.symlink, temp3);
-
-			dbg_parse("TOPOLOGY name='%s', bus='%s', "
-				  "place='%s', symlink='%s'",
-				  dev.name, dev.bus, dev.place, dev.symlink);
-		}
-
-		if (strcasecmp(temp2, TYPE_REPLACE) == 0) {
-			/* number type */
-			dev.type = REPLACE;
-
-			/* KERNEL="kernel_name" */
-			retval = get_value("KERNEL", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.kernel_name, temp3);
-
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.name, temp3);
-
-			/* SYMLINK="name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("SYMLINK", &temp, &temp3);
-			if (retval == 0)
-				strfieldcpy(dev.symlink, temp3);
-
-			dbg_parse("REPLACE name='%s', kernel_name='%s', symlink='%s'",
-				  dev.name, dev.kernel_name, dev.symlink);
-		}
-
-		if (strcasecmp(temp2, TYPE_CALLOUT) == 0) {
-			/* number type */
-			dev.type = CALLOUT;
-
-			/* BUS="bus" */
-			retval = get_value("BUS", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.bus, temp3);
-
-			/* PROGRAM="executable" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("PROGRAM", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.exec_program, temp3);
-
-			/* ID="id" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("ID", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.id, temp3);
-
-			/* NAME="new_name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("NAME", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.name, temp3);
-
-			/* SYMLINK="name" */
-			temp2 = strsep(&temp, ",");
-			retval = get_value("SYMLINK", &temp, &temp3);
-			if (retval == 0)
-				strfieldcpy(dev.symlink, temp3);
-
-			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.result[0] != '\0') && (program_given == 0)) {
+			dbg("RESULT is only useful when PROGRAM called in any rule before");
+			goto error;
 		}
 
+		dev.config_line = lineno;
 		retval = add_config_dev(&dev);
 		if (retval) {
 			dbg("add_config_dev returned with error %d", retval);
-			goto exit;
+			continue;
+error:
+			dbg("%s:%d:%d: parse error, rule skipped",
+				  udev_rules_filename, lineno, temp - line);
 		}
 	}
-	dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_rules_filename,
-		  lineno, temp - line, temp);
 exit:
 	fclose(fd);
 	return retval;
-}	
-
+}
 
 int namedev_init_permissions(void)
 {
@@ -408,7 +294,7 @@ int namedev_init_permissions(void)
 			++temp;
 
 		/* empty line? */
-		if (*temp == 0x00)
+		if ((*temp == '\0') || (*temp == '\n'))
 			continue;
 
 		/* see if this is a comment */
@@ -437,7 +323,7 @@ int namedev_init_permissions(void)
 			dbg("cannot parse line '%s'", line);
 			continue;
 		}
-		strncpy(dev.group, temp2, sizeof(dev.owner));
+		strncpy(dev.group, temp2, sizeof(dev.group));
 
 		if (!temp) {
 			dbg("cannot parse line: %s", line);
@@ -458,6 +344,5 @@ int namedev_init_permissions(void)
 exit:
 	fclose(fd);
 	return retval;
-}	
-
+}