[PATCH] split out the namedev config parsing logic to namedev_parse.c

4 files changed, 475 insertions, 432 deletions

diff --git a/Makefile b/Makefile
index 67d38c0412..7aacb79de2 100644
--- a/Makefile
+++ b/Makefile
@@ -159,6 +159,7 @@ OBJS =	udev.o		\
 	udevdb.o	\
 	logging.o	\
 	namedev.o	\
+	namedev_parse.o	\
 	$(SYSFS)	\
 	$(TDB)
 
diff --git a/namedev.c b/namedev.c
index deb1d929e0..86685f8393 100644
--- a/namedev.c
+++ b/namedev.c
@@ -21,9 +21,6 @@
  *
  */
 
-/* define this to enable parsing debugging */
-/* #define DEBUG_PARSER */
-
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,14 +38,7 @@
 #include "libsysfs/libsysfs.h"
 #include "klibc_fixups.h"
 
-#define TYPE_LABEL	"LABEL"
-#define TYPE_NUMBER	"NUMBER"
-#define TYPE_TOPOLOGY	"TOPOLOGY"
-#define TYPE_REPLACE	"REPLACE"
-#define TYPE_CALLOUT	"CALLOUT"
-#define CALLOUT_MAXARG	8
-
-static LIST_HEAD(config_device_list);
+LIST_HEAD(config_device_list);
 
 /* s2 may end with '*' to match everything */
 static int strncmp_wildcard(char *s1, char *s2, int max)
@@ -63,49 +53,6 @@ static int strncmp_wildcard(char *s1, char *s2, int max)
 	return strncmp(s1, s2, len);
 }
 
-static void dump_dev(struct config_device *dev)
-{
-	switch (dev->type) {
-	case KERNEL_NAME:
-		dbg_parse("KERNEL name='%s' ,"
-			  "owner='%s', group='%s', mode=%#o",
-			  dev->name, dev->owner, dev->group, dev->mode);
-		break;
-	case LABEL:
-		dbg_parse("LABEL name='%s', bus='%s', sysfs_file='%s', sysfs_value='%s', "
-			  "owner='%s', group='%s', mode=%#o",
-			  dev->name, dev->bus, dev->sysfs_file, dev->sysfs_value,
-			  dev->owner, dev->group, dev->mode);
-		break;
-	case NUMBER:
-		dbg_parse("NUMBER name='%s', bus='%s', id='%s', "
-			  "owner='%s', group='%s', mode=%#o",
-			  dev->name, dev->bus, dev->id,
-			  dev->owner, dev->group, dev->mode);
-		break;
-	case TOPOLOGY:
-		dbg_parse("TOPOLOGY name='%s', bus='%s', place='%s', "
-			  "owner='%s', group='%s', mode=%#o",
-			  dev->name, dev->bus, dev->place,
-			  dev->owner, dev->group, dev->mode);
-		break;
-	case REPLACE:
-		dbg_parse("REPLACE name=%s, kernel_name=%s, "
-			  "owner='%s', group='%s', mode=%#o",
-			  dev->name, dev->kernel_name,
-			  dev->owner, dev->group, dev->mode);
-		break;
-	case CALLOUT:
-		dbg_parse("CALLOUT name='%s', bus='%s', program='%s', id='%s', "
-			  "owner='%s', group='%s', mode=%#o",
-			  dev->name, dev->bus, dev->exec_program, dev->id,
-			  dev->owner, dev->group, dev->mode);
-		break;
-	default:
-		dbg_parse("unknown type of method");
-	}
-}
-
 #define copy_var(a, b, var)		\
 	if (b->var)			\
 		a->var = b->var;
@@ -114,7 +61,7 @@ static void dump_dev(struct config_device *dev)
 	if (strlen(b->var))		\
 		strcpy(a->var, b->var);
 
-static int add_dev(struct config_device *new_dev)
+int add_config_dev(struct config_device *new_dev)
 {
 	struct list_head *tmp;
 	struct config_device *tmp_dev;
@@ -146,348 +93,10 @@ static int add_dev(struct config_device *new_dev)
 		return -ENOMEM;
 	memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
 	list_add_tail(&tmp_dev->node, &config_device_list);
-	//dump_dev(tmp_dev);
-	return 0;
-}
-
-static void dump_dev_list(void)
-{
-	struct list_head *tmp;
-
-	list_for_each(tmp, &config_device_list) {
-		struct config_device *dev = list_entry(tmp, struct config_device, node);
-		dump_dev(dev);
-	}
-}
-	
-static 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;
-
-	/* 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;
-	
+	//dump_config_dev(tmp_dev);
 	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;
-}
-
-static int namedev_init_config(void)
-{
-	char line[255];
-	int lineno;
-	char *temp;
-	char *temp2;
-	char *temp3;
-	FILE *fd;
-	int retval = 0;
-	struct config_device dev;
-
-	dbg("opening '%s' to read as config", udev_config_filename);
-	fd = fopen(udev_config_filename, "r");
-	if (fd == NULL) {
-		dbg("can't open '%s'", udev_config_filename);
-		return -ENODEV;
-	}
-
-	/* loop through the whole file */
-	lineno = 0;
-	while (1) {
-		/* get a line */
-		temp = fgets(line, sizeof(line), fd);
-		if (temp == NULL)
-			goto exit;
-		lineno++;
-
-		dbg_parse("read '%s'", temp);
-
-		/* eat the whitespace at the beginning of the line */
-		while (isspace(*temp))
-			++temp;
-
-		/* empty line? */
-		if (*temp == 0x00)
-			continue;
-
-		/* see if this is a comment */
-		if (*temp == COMMENT_CHARACTER)
-			continue;
-
-		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, ",");
-			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);
-
-			dbg_parse("LABEL name='%s', bus='%s', "
-				  "sysfs_file='%s', sysfs_value='%s'",
-				  dev.name, dev.bus, dev.sysfs_file,
-				  dev.sysfs_value);
-		}
-
-		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);
-
-			dbg_parse("NUMBER name='%s', bus='%s', id='%s'",
-				  dev.name, dev.bus, dev.id);
-		}
-
-		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);
-
-			dbg_parse("TOPOLOGY name='%s', bus='%s', place='%s'",
-				  dev.name, dev.bus, dev.place);
-		}
-
-		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);
-			dbg_parse("REPLACE name='%s', kernel_name='%s'",
-				  dev.name, dev.kernel_name);
-		}
-		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);
-			dbg_parse("CALLOUT name='%s', program='%s'",
-				  dev.name, dev.exec_program);
-		}
-
-		retval = add_dev(&dev);
-		if (retval) {
-			dbg("add_dev returned with error %d", retval);
-			goto exit;
-		}
-	}
-	dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
-		  lineno, temp - line, temp);
-exit:
-	fclose(fd);
-	return retval;
-}	
-
-
-static int namedev_init_permissions(void)
-{
-	char line[255];
-	char *temp;
-	char *temp2;
-	FILE *fd;
-	int retval = 0;
-	struct config_device dev;
-
-	dbg("opening '%s' to read as permissions config", udev_config_permission_filename);
-	fd = fopen(udev_config_permission_filename, "r");
-	if (fd == NULL) {
-		dbg("can't open '%s'", udev_config_permission_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 == 0x00)
-			continue;
-
-		/* 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));
-
-		temp2 = strsep(&temp, ":");
-		if (!temp2) {
-			dbg("cannot parse line '%s'", line);
-			continue;
-		}
-		strncpy(dev.owner, temp2, sizeof(dev.owner));
-
-		temp2 = strsep(&temp, ":");
-		if (!temp2) {
-			dbg("cannot parse line '%s'", line);
-			continue;
-		}
-		strncpy(dev.group, temp2, sizeof(dev.owner));
-
-		if (!temp) {
-			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);
-		retval = add_dev(&dev);
-		if (retval) {
-			dbg("add_dev returned with error %d", retval);
-			goto exit;
-		}
-	}
-
-exit:
-	fclose(fd);
-	return retval;
-}	
-
 static mode_t get_default_mode(struct sysfs_class_device *class_dev)
 {
 	/* just default everyone to rw for the world! */
@@ -664,7 +273,7 @@ static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev
 			continue;
 
 		if (sysfs_device) {
-			dbg_parse("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+			dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
 			if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
 				continue;
 		}
@@ -681,10 +290,10 @@ static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(udev->group, dev->group);
 		}
-		dbg_parse("callout returned matching value '%s', '%s' becomes '%s'"
-			  " - owner='%s', group='%s', mode=%#o",
-			  dev->id, class_dev->name, udev->name,
-			  dev->owner, dev->group, dev->mode);
+		dbg("callout returned matching value '%s', '%s' becomes '%s'"
+		    " - owner='%s', group='%s', mode=%#o",
+		    dev->id, class_dev->name, udev->name,
+		    dev->owner, dev->group, dev->mode);
 		return 0;
 	}
 	return -ENODEV;
@@ -702,12 +311,12 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 			continue;
 
 		if (sysfs_device) {
-			dbg_parse("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+			dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
 			if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
 				continue;
 		}
 
-		dbg_parse("look for device attribute '%s'", dev->sysfs_file);
+		dbg("look for device attribute '%s'", dev->sysfs_file);
 		/* try to find the attribute in the class device directory */
 		tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
 		if (tmpattr)
@@ -724,7 +333,7 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 
 label_found:
 		tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
-		dbg_parse("compare attribute '%s' value '%s' with '%s'",
+		dbg("compare attribute '%s' value '%s' with '%s'",
 			  dev->sysfs_file, tmpattr->value, dev->sysfs_value);
 		if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
 			continue;
@@ -735,7 +344,7 @@ label_found:
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(udev->group, dev->group);
 		}
-		dbg_parse("found matching attribute '%s', '%s' becomes '%s' "
+		dbg("found matching attribute '%s', '%s' becomes '%s' "
 			  "- owner='%s', group='%s', mode=%#o",
 			  dev->sysfs_file, class_dev->name, udev->name,
 			  dev->owner, dev->group, dev->mode);
@@ -762,20 +371,20 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
 		if (dev->type != NUMBER)
 			continue;
 
-		dbg_parse("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+		dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
 		if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
 			continue;
 
 		found = 0;
 		strfieldcpy(path, sysfs_device->path);
 		temp = strrchr(path, '/');
-		dbg_parse("search '%s' in '%s', path='%s'", dev->id, temp, path);
+		dbg("search '%s' in '%s', path='%s'", dev->id, temp, path);
 		if (strstr(temp, dev->id) != NULL) {
 			found = 1;
 		} else {
 			*temp = 0x00;
 			temp = strrchr(path, '/');
-			dbg_parse("search '%s' in '%s', path='%s'", dev->id, temp, path);
+			dbg("search '%s' in '%s', path='%s'", dev->id, temp, path);
 			if (strstr(temp, dev->id) != NULL)
 				found = 1;
 		}
@@ -787,10 +396,10 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(udev->group, dev->group);
 		}
-		dbg_parse("found matching id '%s', '%s' becomes '%s'"
-			  " - owner='%s', group ='%s', mode=%#o",
-			  dev->id, class_dev->name, udev->name,
-			  dev->owner, dev->group, dev->mode);
+		dbg("found matching id '%s', '%s' becomes '%s'"
+		    " - owner='%s', group ='%s', mode=%#o",
+		    dev->id, class_dev->name, udev->name,
+		    dev->owner, dev->group, dev->mode);
 		return 0;
 	}
 	return -ENODEV;
@@ -813,20 +422,20 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
 		if (dev->type != TOPOLOGY)
 			continue;
 
-		dbg_parse("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+		dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
 		if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
 			continue;
 
 		found = 0;
 		strfieldcpy(path, sysfs_device->path);
 		temp = strrchr(path, '/');
-		dbg_parse("search '%s' in '%s', path='%s'", dev->place, temp, path);
+		dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
 		if (strstr(temp, dev->place) != NULL) {
 			found = 1;
 		} else {
 			*temp = 0x00;
 			temp = strrchr(path, '/');
-			dbg_parse("search '%s' in '%s', path='%s'", dev->place, temp, path);
+			dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
 			if (strstr(temp, dev->place) != NULL)
 				found = 1;
 		}
@@ -839,10 +448,10 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(udev->group, dev->group);
 		}
-		dbg_parse("found matching place '%s', '%s' becomes '%s'"
-			  " - owner='%s', group ='%s', mode=%#o",
-			  dev->place, class_dev->name, udev->name,
-			  dev->owner, dev->group, dev->mode);
+		dbg("found matching place '%s', '%s' becomes '%s'"
+		    " - owner='%s', group ='%s', mode=%#o",
+		    dev->place, class_dev->name, udev->name,
+		    dev->owner, dev->group, dev->mode);
 		return 0;
 	}
 	return -ENODEV;
@@ -858,8 +467,7 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
 		if (dev->type != REPLACE)
 			continue;
 
-		dbg_parse("compare name '%s' with '%s'",
-			  dev->kernel_name, class_dev->name);
+		dbg("compare name '%s' with '%s'", dev->kernel_name, class_dev->name);
 		if (strncmp_wildcard(class_dev->name, dev->kernel_name, NAME_SIZE) != 0)
 			continue;
 
@@ -869,9 +477,10 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(udev->group, dev->group);
 		}
-		dbg_parse("found name, '%s' becomes '%s' - owner='%s', group='%s', mode = %#o",
-			  dev->kernel_name, udev->name, 
-			  dev->owner, dev->group, dev->mode);
+		dbg("found name, '%s' becomes '%s'"
+		    " - owner='%s', group='%s', mode = %#o",
+		    dev->kernel_name, udev->name,
+		    dev->owner, dev->group, dev->mode);
 		
 		return 0;
 	}
@@ -892,7 +501,7 @@ static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *
 		if (strncmp_wildcard(class_dev->name, dev->name, sizeof(dev->name)))
 			continue;
 		if (dev->mode != 0) {
-			dbg_parse("found permissions for '%s'", class_dev->name);
+			dbg("found permissions for '%s'", class_dev->name);
 			udev->mode = dev->mode;
 			strfieldcpy(udev->owner, dev->owner);
 			strfieldcpy(udev->group, dev->group);
@@ -919,20 +528,20 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 		 * up in the kernel...
 		 */
 		if (strstr(class_dev->path, "block")) {
-			dbg_parse("looking at block device");
+			dbg("looking at block device");
 			if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
 				char path[SYSFS_PATH_MAX];
 
-				dbg_parse("really is a partition");
+				dbg("really is a partition");
 				strfieldcpy(path, class_dev->path);
 				temp = strrchr(path, '/');
 				*temp = 0x00;
-				dbg_parse("looking for a class device at '%s'", path);
+				dbg("looking for a class device at '%s'", path);
 				class_dev_parent = sysfs_open_class_device(path);
 				if (class_dev_parent == NULL) {
 					dbg("sysfs_open_class_device at '%s' failed", path);
 				} else {
-					dbg_parse("class_dev_parent->name='%s'", class_dev_parent->name);
+					dbg("class_dev_parent->name='%s'", class_dev_parent->name);
 					if (class_dev_parent->sysdevice)
 						sysfs_device = class_dev_parent->sysdevice;
 				}
@@ -941,12 +550,12 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 	}
 		
 	if (sysfs_device) {
-		dbg_parse("sysfs_device->path='%s'", sysfs_device->path);
-		dbg_parse("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
-		dbg_parse("sysfs_device->bus='%s'", sysfs_device->bus);
+		dbg("sysfs_device->path='%s'", sysfs_device->path);
+		dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
+		dbg("sysfs_device->bus='%s'", sysfs_device->bus);
 		strfieldcpy(udev->bus_id, sysfs_device->bus_id);
 	} else {
-		dbg_parse("class_dev->name = '%s'", class_dev->name);
+		dbg("class_dev->name = '%s'", class_dev->name);
 	}
 
 	build_kernel_number(class_dev, udev);
@@ -1005,6 +614,6 @@ int namedev_init(void)
 	if (retval)
 		return retval;
 
-	dump_dev_list();
+	dump_config_dev_list();
 	return retval;
 }
diff --git a/namedev.h b/namedev.h
index 5ea843e9b7..1405d07e04 100644
--- a/namedev.h
+++ b/namedev.h
@@ -45,6 +45,12 @@ enum config_type {
 #define ID_SIZE		50
 #define PLACE_SIZE	50
 
+#define TYPE_LABEL	"LABEL"
+#define TYPE_NUMBER	"NUMBER"
+#define TYPE_TOPOLOGY	"TOPOLOGY"
+#define TYPE_REPLACE	"REPLACE"
+#define TYPE_CALLOUT	"CALLOUT"
+#define CALLOUT_MAXARG	8
 
 struct config_device {
 	struct list_head node;
@@ -65,8 +71,15 @@ struct config_device {
 	mode_t mode;
 };
 
+extern struct list_head config_device_list;
 
 extern int namedev_init(void);
 extern int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev);
+extern int namedev_init_permissions(void);
+extern int namedev_init_config(void);
+
+extern int add_config_dev(struct config_device *new_dev);
+extern void dump_config_dev(struct config_device *dev);
+extern void dump_config_dev_list(void);
 
 #endif
diff --git a/namedev_parse.c b/namedev_parse.c
new file mode 100644
index 0000000000..a752b33050
--- /dev/null
+++ b/namedev_parse.c
@@ -0,0 +1,420 @@
+/*
+ * namedev_parse.c
+ *
+ * Userspace devfs
+ *
+ * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ *
+ *
+ *	This program is free software; you can redistribute it and/or modify it
+ *	under the terms of the GNU General Public License as published by the
+ *	Free Software Foundation version 2 of the License.
+ * 
+ *	This program is distributed in the hope that it will be useful, but
+ *	WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *	General Public License for more details.
+ * 
+ *	You should have received a copy of the GNU General Public License along
+ *	with this program; if not, write to the Free Software Foundation, Inc.,
+ *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+/* define this to enable parsing debugging */
+/* #define DEBUG_PARSER */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "udev.h"
+#include "namedev.h"
+
+static 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;
+
+	/* 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;
+}
+
+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' ,"
+			  "owner='%s', group='%s', mode=%#o",
+			  dev->name, dev->owner, dev->group, dev->mode);
+		break;
+	case LABEL:
+		dbg_parse("LABEL name='%s', bus='%s', sysfs_file='%s', sysfs_value='%s', "
+			  "owner='%s', group='%s', mode=%#o",
+			  dev->name, dev->bus, dev->sysfs_file, dev->sysfs_value,
+			  dev->owner, dev->group, dev->mode);
+		break;
+	case NUMBER:
+		dbg_parse("NUMBER name='%s', bus='%s', id='%s', "
+			  "owner='%s', group='%s', mode=%#o",
+			  dev->name, dev->bus, dev->id,
+			  dev->owner, dev->group, dev->mode);
+		break;
+	case TOPOLOGY:
+		dbg_parse("TOPOLOGY name='%s', bus='%s', place='%s', "
+			  "owner='%s', group='%s', mode=%#o",
+			  dev->name, dev->bus, dev->place,
+			  dev->owner, dev->group, dev->mode);
+		break;
+	case REPLACE:
+		dbg_parse("REPLACE name=%s, kernel_name=%s, "
+			  "owner='%s', group='%s', mode=%#o",
+			  dev->name, dev->kernel_name,
+			  dev->owner, dev->group, dev->mode);
+		break;
+	case CALLOUT:
+		dbg_parse("CALLOUT name='%s', bus='%s', program='%s', id='%s', "
+			  "owner='%s', group='%s', mode=%#o",
+			  dev->name, dev->bus, dev->exec_program, dev->id,
+			  dev->owner, dev->group, dev->mode);
+		break;
+	default:
+		dbg_parse("unknown type of method");
+	}
+}
+
+void dump_config_dev_list(void)
+{
+	struct list_head *tmp;
+
+	list_for_each(tmp, &config_device_list) {
+		struct config_device *dev = list_entry(tmp, struct config_device, node);
+		dump_config_dev(dev);
+	}
+}
+	
+int namedev_init_config(void)
+{
+	char line[255];
+	int lineno;
+	char *temp;
+	char *temp2;
+	char *temp3;
+	FILE *fd;
+	int retval = 0;
+	struct config_device dev;
+
+	dbg("opening '%s' to read as config", udev_config_filename);
+	fd = fopen(udev_config_filename, "r");
+	if (fd == NULL) {
+		dbg("can't open '%s'", udev_config_filename);
+		return -ENODEV;
+	}
+
+	/* loop through the whole file */
+	lineno = 0;
+	while (1) {
+		/* get a line */
+		temp = fgets(line, sizeof(line), fd);
+		if (temp == NULL)
+			goto exit;
+		lineno++;
+
+		dbg_parse("read '%s'", temp);
+
+		/* eat the whitespace at the beginning of the line */
+		while (isspace(*temp))
+			++temp;
+
+		/* empty line? */
+		if (*temp == 0x00)
+			continue;
+
+		/* see if this is a comment */
+		if (*temp == COMMENT_CHARACTER)
+			continue;
+
+		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, ",");
+			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);
+
+			dbg_parse("LABEL name='%s', bus='%s', "
+				  "sysfs_file='%s', sysfs_value='%s'",
+				  dev.name, dev.bus, dev.sysfs_file,
+				  dev.sysfs_value);
+		}
+
+		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);
+
+			dbg_parse("NUMBER name='%s', bus='%s', id='%s'",
+				  dev.name, dev.bus, dev.id);
+		}
+
+		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);
+
+			dbg_parse("TOPOLOGY name='%s', bus='%s', place='%s'",
+				  dev.name, dev.bus, dev.place);
+		}
+
+		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);
+			dbg_parse("REPLACE name='%s', kernel_name='%s'",
+				  dev.name, dev.kernel_name);
+		}
+		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);
+			dbg_parse("CALLOUT name='%s', program='%s'",
+				  dev.name, dev.exec_program);
+		}
+
+		retval = add_config_dev(&dev);
+		if (retval) {
+			dbg("add_config_dev returned with error %d", retval);
+			goto exit;
+		}
+	}
+	dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
+		  lineno, temp - line, temp);
+exit:
+	fclose(fd);
+	return retval;
+}	
+
+
+int namedev_init_permissions(void)
+{
+	char line[255];
+	char *temp;
+	char *temp2;
+	FILE *fd;
+	int retval = 0;
+	struct config_device dev;
+
+	dbg("opening '%s' to read as permissions config", udev_config_permission_filename);
+	fd = fopen(udev_config_permission_filename, "r");
+	if (fd == NULL) {
+		dbg("can't open '%s'", udev_config_permission_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 == 0x00)
+			continue;
+
+		/* 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));
+
+		temp2 = strsep(&temp, ":");
+		if (!temp2) {
+			dbg("cannot parse line '%s'", line);
+			continue;
+		}
+		strncpy(dev.owner, temp2, sizeof(dev.owner));
+
+		temp2 = strsep(&temp, ":");
+		if (!temp2) {
+			dbg("cannot parse line '%s'", line);
+			continue;
+		}
+		strncpy(dev.group, temp2, sizeof(dev.owner));
+
+		if (!temp) {
+			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);
+		retval = add_config_dev(&dev);
+		if (retval) {
+			dbg("add_config_dev returned with error %d", retval);
+			goto exit;
+		}
+	}
+
+exit:
+	fclose(fd);
+	return retval;
+}	
+
+