X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.c;h=9a556cb83d7ff8e19383d375f4927dbdfb9f7009;hb=d6d413dab79ed03e0531f90fb42a85baacd6e9b5;hp=6444dd0feb957377cf3bd762a09a46c637da5a59;hpb=7408a7fbb5885033d266b4b31c3abeb695820da3;p=elogind.git

diff --git a/namedev.c b/namedev.c
index 6444dd0fe..9a556cb83 100644
--- a/namedev.c
+++ b/namedev.c
@@ -22,7 +22,7 @@
  */
 
 /* define this to enable parsing debugging */
-#define DEBUG_PARSER 
+/* #define DEBUG_PARSER */
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -105,24 +105,30 @@ static int add_dev(struct config_device *new_dev)
 	struct list_head *tmp;
 	struct config_device *tmp_dev;
 
-	/* loop through the whole list of devices to see if we already have
-	 * this one... */
+	/* update the values if we already have the device */
 	list_for_each(tmp, &config_device_list) {
 		struct config_device *dev = list_entry(tmp, struct config_device, node);
-		if (strcmp(dev->name, new_dev->name) == 0) {
-			/* the same, copy the new info into this structure */
-			copy_var(dev, new_dev, type);
-			copy_var(dev, new_dev, mode);
-			copy_string(dev, new_dev, bus);
-			copy_string(dev, new_dev, sysfs_file);
-			copy_string(dev, new_dev, sysfs_value);
-			copy_string(dev, new_dev, id);
-			copy_string(dev, new_dev, place);
-			copy_string(dev, new_dev, kernel_name);
-			copy_string(dev, new_dev, owner);
-			copy_string(dev, new_dev, group);
-			return 0;
+		int len = strlen(new_dev->name);
+		if (new_dev->name[len-1] == '*') {
+			len--;
+			if (strncmp(dev->name, new_dev->name, len))
+				continue;
+		} else {
+			if (strcmp(dev->name, new_dev->name))
+				continue;
 		}
+		/* the same, copy the new info into this structure */
+		copy_var(dev, new_dev, type);
+		copy_var(dev, new_dev, mode);
+		copy_string(dev, new_dev, bus);
+		copy_string(dev, new_dev, sysfs_file);
+		copy_string(dev, new_dev, sysfs_value);
+		copy_string(dev, new_dev, id);
+		copy_string(dev, new_dev, place);
+		copy_string(dev, new_dev, kernel_name);
+		copy_string(dev, new_dev, owner);
+		copy_string(dev, new_dev, group);
+		return 0;
 	}
 
 	/* not found, lets create a new structure, and add it to the list */
@@ -144,37 +150,15 @@ static void dump_dev_list(void)
 		dump_dev(dev);
 	}
 }
-
-static int get_value(const char *left, char **orig_string, char **ret_string)
-{
-	char *temp;
-	char *string = *orig_string;
-
-	/* eat any whitespace */
-	while (isspace(*string))
-		++string;
-
-	/* split based on '=' */
-	temp = strsep(&string, "=");
-	if (strcasecmp(temp, left) == 0) {
-		/* got it, now strip off the '"' */
-		while (isspace(*string))
-			++string;
-		if (*string == '"')
-			++string;
-		temp = strsep(&string, "\"");
-		*ret_string = temp;
-		*orig_string = string;
-		return 0;
-	}
-	return -ENODEV;
-}
 	
 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;
@@ -182,22 +166,43 @@ static int get_pair(char **orig_string, char **left, char **right)
 	/* 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;
+}
+
 static int namedev_init_config(void)
 {
 	char line[255];
+	int lineno;
 	char *temp;
 	char *temp2;
 	char *temp3;
@@ -213,11 +218,13 @@ static int namedev_init_config(void)
 	}
 
 	/* loop through the whole file */
+	lineno = 0;
 	while (1) {
 		/* get a line */
 		temp = fgets(line, sizeof(line), fd);
 		if (temp == NULL)
-			break;
+			goto exit;
+		lineno++;
 
 		dbg_parse("read %s", temp);
 
@@ -244,23 +251,23 @@ static int namedev_init_config(void)
 			/* BUS="bus" */
 			retval = get_value("BUS", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.bus, temp3);
+				break;
+			strfieldcpy(dev.bus, temp3);
 
 			/* file="value" */
 			temp2 = strsep(&temp, ",");
 			retval = get_pair(&temp, &temp2, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.sysfs_file, temp2);
-			strcpy(dev.sysfs_value, temp3);
+				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)
-				continue;
-			strcpy(dev.name, temp3);
+				break;
+			strfieldcpy(dev.name, temp3);
 
 			dbg_parse("LABEL name = '%s', bus = '%s', "
 				"sysfs_file = '%s', sysfs_value = '%s'", 
@@ -275,22 +282,22 @@ static int namedev_init_config(void)
 			/* BUS="bus" */
 			retval = get_value("BUS", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.bus, temp3);
+				break;
+			strfieldcpy(dev.bus, temp3);
 
 			/* ID="id" */
 			temp2 = strsep(&temp, ",");
 			retval = get_value("id", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.id, temp3);
+				break;
+			strfieldcpy(dev.id, temp3);
 
 			/* NAME="new_name" */
 			temp2 = strsep(&temp, ",");
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.name, temp3);
+				break;
+			strfieldcpy(dev.name, temp3);
 
 			dbg_parse("NUMBER name = '%s', bus = '%s', id = '%s'",
 					dev.name, dev.bus, dev.id);
@@ -303,22 +310,22 @@ static int namedev_init_config(void)
 			/* BUS="bus" */
 			retval = get_value("BUS", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.bus, temp3);
+				break;
+			strfieldcpy(dev.bus, temp3);
 
 			/* PLACE="place" */
 			temp2 = strsep(&temp, ",");
 			retval = get_value("place", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.place, temp3);
+				break;
+			strfieldcpy(dev.place, temp3);
 
 			/* NAME="new_name" */
 			temp2 = strsep(&temp, ",");
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.name, temp3);
+				break;
+			strfieldcpy(dev.name, temp3);
 
 			dbg_parse("TOPOLOGY name = '%s', bus = '%s', place = '%s'",
 					dev.name, dev.bus, dev.place);
@@ -331,15 +338,15 @@ static int namedev_init_config(void)
 			/* KERNEL="kernel_name" */
 			retval = get_value("KERNEL", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.kernel_name, temp3);
+				break;
+			strfieldcpy(dev.kernel_name, temp3);
 
 			/* NAME="new_name" */
 			temp2 = strsep(&temp, ",");
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.name, temp3);
+				break;
+			strfieldcpy(dev.name, temp3);
 			dbg_parse("REPLACE name = %s, kernel_name = %s",
 					dev.name, dev.kernel_name);
 		}
@@ -350,29 +357,29 @@ static int namedev_init_config(void)
 			/* PROGRAM="executable" */
 			retval = get_value("PROGRAM", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.exec_program, temp3);
+				break;
+			strfieldcpy(dev.exec_program, temp3);
 
 			/* BUS="bus" */
 			temp2 = strsep(&temp, ",");
 			retval = get_value("BUS", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.bus, temp3);
+				break;
+			strfieldcpy(dev.bus, temp3);
 
 			/* ID="id" */
 			temp2 = strsep(&temp, ",");
 			retval = get_value("ID", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.id, temp3);
+				break;
+			strfieldcpy(dev.id, temp3);
 
 			/* NAME="new_name" */
 			temp2 = strsep(&temp, ",");
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
-				continue;
-			strcpy(dev.name, temp3);
+				break;
+			strfieldcpy(dev.name, temp3);
 			dbg_parse("CALLOUT name = %s, program = %s",
 					dev.name, dev.exec_program);
 		}
@@ -383,7 +390,8 @@ static int namedev_init_config(void)
 			goto exit;
 		}
 	}
-
+	dbg_parse("%s:%d:%Zd: error parsing ``%s''", udev_config_filename,
+		  lineno, temp - line, temp);
 exit:
 	fclose(fd);
 	return retval;
@@ -552,11 +560,11 @@ static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev
 			continue;
 		if (strncmp(value, dev->id, sizeof(value)) != 0)
 			continue;
-		strcpy(udev->name, dev->name);
+		strfieldcpy(udev->name, dev->name);
 		if (dev->mode != 0) {
 			udev->mode = dev->mode;
-			strcpy(udev->owner, dev->owner);
-			strcpy(udev->group, dev->group);
+			strfieldcpy(udev->owner, dev->owner);
+			strfieldcpy(udev->group, dev->group);
 		}
 		dbg_parse("device callout '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
 			dev->id, udev->name, 
@@ -571,7 +579,6 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 	struct sysfs_attribute *tmpattr = NULL;
 	struct config_device *dev;
 	struct list_head *tmp;
-	char *temp = NULL;
 
 	list_for_each(tmp, &config_device_list) {
 		dev = list_entry(tmp, struct config_device, node);
@@ -600,11 +607,11 @@ label_found:
 		if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
 			continue;
 
-		strcpy(udev->name, dev->name);
+		strfieldcpy(udev->name, dev->name);
 		if (dev->mode != 0) {
 			udev->mode = dev->mode;
-			strcpy(udev->owner, dev->owner);
-			strcpy(udev->group, dev->group);
+			strfieldcpy(udev->owner, dev->owner);
+			strfieldcpy(udev->group, dev->group);
 		}
 		dbg_parse("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
 			dev->sysfs_file, dev->sysfs_value, udev->name, 
@@ -633,7 +640,7 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
 			continue;
 
 		found = 0;
-		strcpy(path, sysfs_device->path);
+		strfieldcpy(path, sysfs_device->path);
 		temp = strrchr(path, '/');
 		dbg_parse("NUMBER path = '%s'", path);
 		dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
@@ -648,11 +655,11 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
 		}
 		if (!found)
 			continue;
-		strcpy(udev->name, dev->name);
+		strfieldcpy(udev->name, dev->name);
 		if (dev->mode != 0) {
 			udev->mode = dev->mode;
-			strcpy(udev->owner, dev->owner);
-			strcpy(udev->group, dev->group);
+			strfieldcpy(udev->owner, dev->owner);
+			strfieldcpy(udev->group, dev->group);
 		}
 		dbg_parse("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
 			dev->id, udev->name, 
@@ -681,7 +688,7 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
 			continue;
 
 		found = 0;
-		strcpy(path, sysfs_device->path);
+		strfieldcpy(path, sysfs_device->path);
 		temp = strrchr(path, '/');
 		dbg_parse("TOPOLOGY path = '%s'", path);
 		dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
@@ -697,11 +704,11 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
 		if (!found)
 			continue;
 
-		strcpy(udev->name, dev->name);
+		strfieldcpy(udev->name, dev->name);
 		if (dev->mode != 0) {
 			udev->mode = dev->mode;
-			strcpy(udev->owner, dev->owner);
-			strcpy(udev->group, dev->group);
+			strfieldcpy(udev->owner, dev->owner);
+			strfieldcpy(udev->group, dev->group);
 		}
 		dbg_parse("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
 			dev->place, udev->name, 
@@ -727,11 +734,11 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
 		if (strcmp(dev->kernel_name, class_dev->name) != 0)
 			continue;
 
-		strcpy(udev->name, dev->name);
+		strfieldcpy(udev->name, dev->name);
 		if (dev->mode != 0) {
 			udev->mode = dev->mode;
-			strcpy(udev->owner, dev->owner);
-			strcpy(udev->group, dev->group);
+			strfieldcpy(udev->owner, dev->owner);
+			strfieldcpy(udev->group, dev->group);
 		}
 		dbg_parse("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
 			dev->kernel_name, udev->name, 
@@ -742,6 +749,33 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
 	return -ENODEV;
 }
 
+static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+	struct config_device *dev;
+	struct list_head *tmp;
+	int len;
+
+	strfieldcpy(udev->name, class_dev->name);
+	list_for_each(tmp, &config_device_list) {
+		dev = list_entry(tmp, struct config_device, node);
+		len = strlen(dev->name);
+		if (dev->name[len-1] == '*') {
+			len--;
+			if (strncmp(dev->name, class_dev->name, len))
+				continue;
+		} else {
+			if (strcmp(dev->name, class_dev->name))
+				continue;
+		}
+		if (dev->mode != 0) {
+			dbg_parse("found permissions from config for '%s'", class_dev->name);
+			udev->mode = dev->mode;
+			strfieldcpy(udev->owner, dev->owner);
+			strfieldcpy(udev->group, dev->group);
+		}
+	}
+}
+
 static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
 	struct sysfs_device *sysfs_device = NULL;
@@ -766,7 +800,7 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 				char path[SYSFS_PATH_MAX];
 
 				dbg_parse("really is a partition...");
-				strcpy(path, class_dev->path);
+				strfieldcpy(path, class_dev->path);
 				temp = strrchr(path, '/');
 				*temp = 0x00;
 				dbg_parse("looking for a class device at '%s'", path);
@@ -792,53 +826,61 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 	/* rules are looked at in priority order */
 	retval = do_callout(class_dev, udev);
 	if (retval == 0)
-		goto done;
+		goto found;
 
 	retval = do_label(class_dev, udev, sysfs_device);
 	if (retval == 0)
-		goto done;
+		goto found;
 
 	retval = do_number(class_dev, udev, sysfs_device);
 	if (retval == 0)
-		goto done;
+		goto found;
 
 	retval = do_topology(class_dev, udev, sysfs_device);
 	if (retval == 0)
-		goto done;
+		goto found;
 
 	retval = do_replace(class_dev, udev);
 	if (retval == 0)
-		goto done;
+		goto found;
 
-	strcpy(udev->name, class_dev->name);
+	do_kernelname(class_dev, udev);
+	goto done;
 
-done:
+found:
 	/* substitute placeholder in NAME  */
 	while (1) {
 		char *pos = strchr(udev->name, '%');
 		char *dig;
 		char name[NAME_SIZE];
 		if (pos) {
-			strcpy(name, pos+2);
+			strfieldcpy(name, pos+2);
 			*pos = 0x00;
 			switch (pos[1]) {
+			case 'b':
+				if (!sysfs_device)
+					break;
+				strcat(udev->name, sysfs_device->bus_id);
+				dbg("bus_id appended: %s", 
+						sysfs_device->bus_id);
+				break;
 			case 'n':
 				dig = class_dev->name + strlen(class_dev->name);
 				while (isdigit(*(dig-1)))
 					dig--;
 				strcat(udev->name, dig);
-				dbg_parse("kernel number appended: %s", dig);
+				dbg("kernel number appended: %s", dig);
 				break;
 			case 'm':
 				sprintf(pos, "%u", udev->minor);
-				dbg_parse("minor number appended: %u", udev->minor);
+				dbg("minor number appended: %u", udev->minor);
 				break;
 			case 'M':
 				sprintf(pos, "%u", udev->major);
-				dbg_parse("major number appended: %u", udev->major);
+				dbg("major number appended: %u", udev->major);
 				break;
 			default:
-				dbg_parse("unknown substitution type: %%%c", pos[1]);
+				dbg("unknown substitution type: %%%c", pos[1]);
 				break;
 			}
 			strcat(udev->name, name);
@@ -846,6 +888,7 @@ done:
 			break;
 	}
 
+done:
 	/* mode was never set above */
 	if (!udev->mode) {
 		udev->mode = get_default_mode(class_dev);