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

diff --git a/namedev_parse.c b/namedev_parse.c
index 3578058a7..02ffb0a3e 100644
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -36,6 +36,19 @@
 #include "udev.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;
@@ -78,8 +91,8 @@ void dump_config_dev(struct config_device *dev)
 		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);
+		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'",
@@ -158,18 +171,18 @@ int namedev_init_rules(void)
 		lineno++;
 		dbg_parse("read '%s'", temp);
 
+		/* eat the whitespace */
+		while (isspace(*temp))
+			++temp;
+
 		/* empty line? */
-		if (*temp == 0x00)
+		if ((*temp == '\0') || (*temp == '\n'))
 			continue;
 
 		/* see if this is a comment */
 		if (*temp == COMMENT_CHARACTER)
 			continue;
 
-		/* eat the whitespace */
-		while (isspace(*temp))
-			++temp;
-
 		memset(&dev, 0x00, sizeof(struct config_device));
 
 		/* get the method */
@@ -225,9 +238,23 @@ keys:
 			}
 
 			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) {
+					/* remove prepended 'SYSFS_' */
+					strfieldcpy(pair->file, temp2 + sizeof(FIELD_SYSFS)-1);
+					strfieldcpy(pair->value, temp3);
+				}
 				continue;
 			}
 
@@ -257,18 +284,17 @@ keys:
 		/* 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);
+			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.bus == '\0') ||
-			    (*dev.sysfs_file == '\0') ||
-			    (*dev.sysfs_value == '\0'))
+			    (*dev.sysfs_pair[0].file == '\0') ||
+			    (*dev.sysfs_pair[0].value == '\0'))
 				goto error;
 			break;
 		case NUMBER:
-			dbg_parse("NUMBER name='%s', bus='%s', id='%s', symlink='%s'",
+			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') ||
@@ -276,7 +302,7 @@ keys:
 				goto error;
 			break;
 		case TOPOLOGY:
-			dbg_parse("TOPOLOGY name='%s', bus='%s', "
+			dbg_parse(TYPE_TOPOLOGY " name='%s', bus='%s', "
 				  "place='%s', symlink='%s'",
 				  dev.name, dev.bus, dev.place, dev.symlink);
 			if ((*dev.name == '\0') ||
@@ -285,25 +311,24 @@ keys:
 				goto error;
 			break;
 		case REPLACE:
-			dbg_parse("REPLACE name='%s', kernel_name='%s', symlink='%s'",
+			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("CALLOUT name='%s', bus='%s', program='%s', "
+			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.bus == '\0') ||
 			    (*dev.id == '\0') ||
 			    (*dev.exec_program == '\0'))
 				goto error;
 			break;
 		default:
-			dbg_parse("xxx default method");
+			dbg_parse("unknown type of method");
 			goto error;
 		}
 
@@ -351,7 +376,7 @@ int namedev_init_permissions(void)
 			++temp;
 
 		/* empty line? */
-		if (*temp == 0x00)
+		if ((*temp == '\0') || (*temp == '\n'))
 			continue;
 
 		/* see if this is a comment */