X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.c;h=99542dc4d668a1216eb92e5f2ee7ee6cbfd1e718;hb=a34ea8f598af378dcd63528b6328d1bff7fab0f1;hp=ac05fd88e4d4e4cc31ddd2dbc44a40164cffab7c;hpb=c2405f502cae4a634a25674306cffefb85df9ebb;p=elogind.git

diff --git a/namedev.c b/namedev.c
index ac05fd88e..99542dc4d 100644
--- a/namedev.c
+++ b/namedev.c
@@ -54,38 +54,38 @@ static void dump_dev(struct config_device *dev)
 	case KERNEL_NAME:
 		dbg_parse("KERNEL name ='%s'"
 			" owner = '%s', group = '%s', mode = '%#o'",
-			dev->attr.name, 
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
+			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->attr.name, dev->bus, dev->sysfs_file, dev->sysfs_value,
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
+			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->attr.name, dev->bus, dev->id,
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
+			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->attr.name, dev->bus, dev->place,
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
+			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->attr.name, dev->kernel_name,
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
+			dev->name, dev->kernel_name,
+			dev->owner, dev->group, dev->mode);
 		break;
 	case CALLOUT:
 		dbg_parse("CALLOUT name = '%s', program ='%s', bus = '%s', id = '%s'"
 			" owner = '%s', group = '%s', mode = '%#o'",
-			dev->attr.name, dev->exec_program, dev->bus, dev->id,
-			dev->attr.owner, dev->attr.group, dev->attr.mode);
+			dev->name, dev->exec_program, dev->bus, dev->id,
+			dev->owner, dev->group, dev->mode);
 		break;
 	default:
 		dbg_parse("Unknown type of device!");
@@ -109,18 +109,18 @@ static int add_dev(struct config_device *new_dev)
 	 * this one... */
 	list_for_each(tmp, &config_device_list) {
 		struct config_device *dev = list_entry(tmp, struct config_device, node);
-		if (strcmp(dev->attr.name, new_dev->attr.name) == 0) {
+		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, attr.mode);
+			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, attr.owner);
-			copy_string(dev, new_dev, attr.group);
+			copy_string(dev, new_dev, owner);
+			copy_string(dev, new_dev, group);
 			return 0;
 		}
 	}
@@ -197,7 +197,6 @@ static int get_pair(char **orig_string, char **left, char **right)
 
 static int namedev_init_config(void)
 {
-	char filename[255];
 	char line[255];
 	char *temp;
 	char *temp2;
@@ -206,11 +205,10 @@ static int namedev_init_config(void)
 	int retval = 0;
 	struct config_device dev;
 
-	strcpy(filename, UDEV_CONFIG_DIR NAMEDEV_CONFIG_FILE);
-	dbg("opening %s to read as permissions config", filename);
-	fd = fopen(filename, "r");
+	dbg("opening %s to read as config", udev_config_filename);
+	fd = fopen(udev_config_filename, "r");
 	if (fd == NULL) {
-		dbg("Can't open %s", filename);
+		dbg("Can't open %s", udev_config_filename);
 		return -ENODEV;
 	}
 
@@ -262,11 +260,11 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.attr.name, temp3);
+			strcpy(dev.name, temp3);
 
 			dbg_parse("LABEL name = '%s', bus = '%s', "
 				"sysfs_file = '%s', sysfs_value = '%s'", 
-				dev.attr.name, dev.bus, dev.sysfs_file, 
+				dev.name, dev.bus, dev.sysfs_file, 
 				dev.sysfs_value);
 		}
 
@@ -292,10 +290,10 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.attr.name, temp3);
+			strcpy(dev.name, temp3);
 
 			dbg_parse("NUMBER name = '%s', bus = '%s', id = '%s'",
-					dev.attr.name, dev.bus, dev.id);
+					dev.name, dev.bus, dev.id);
 		}
 
 		if (strcasecmp(temp2, TYPE_TOPOLOGY) == 0) {
@@ -320,10 +318,10 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.attr.name, temp3);
+			strcpy(dev.name, temp3);
 
 			dbg_parse("TOPOLOGY name = '%s', bus = '%s', place = '%s'",
-					dev.attr.name, dev.bus, dev.place);
+					dev.name, dev.bus, dev.place);
 		}
 
 		if (strcasecmp(temp2, TYPE_REPLACE) == 0) {
@@ -341,9 +339,9 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.attr.name, temp3);
+			strcpy(dev.name, temp3);
 			dbg_parse("REPLACE name = %s, kernel_name = %s",
-					dev.attr.name, dev.kernel_name);
+					dev.name, dev.kernel_name);
 		}
 		if (strcasecmp(temp2, TYPE_CALLOUT) == 0) {
 			/* number type */
@@ -374,9 +372,9 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.attr.name, temp3);
+			strcpy(dev.name, temp3);
 			dbg_parse("CALLOUT name = %s, program = %s",
-					dev.attr.name, dev.exec_program);
+					dev.name, dev.exec_program);
 		}
 
 		retval = add_dev(&dev);
@@ -394,7 +392,6 @@ exit:
 
 static int namedev_init_permissions(void)
 {
-	char filename[255];
 	char line[255];
 	char *temp;
 	char *temp2;
@@ -402,11 +399,10 @@ static int namedev_init_permissions(void)
 	int retval = 0;
 	struct config_device dev;
 
-	strcpy(filename, UDEV_CONFIG_DIR NAMEDEV_CONFIG_PERMISSION_FILE);
-	dbg("opening %s to read as permissions config", filename);
-	fd = fopen(filename, "r");
+	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", filename);
+		dbg("Can't open %s", udev_config_permission_filename);
 		return -ENODEV;
 	}
 
@@ -435,19 +431,19 @@ static int namedev_init_permissions(void)
 
 		/* parse the line */
 		temp2 = strsep(&temp, ":");
-		strncpy(dev.attr.name, temp2, sizeof(dev.attr.name));
+		strncpy(dev.name, temp2, sizeof(dev.name));
 
 		temp2 = strsep(&temp, ":");
-		strncpy(dev.attr.owner, temp2, sizeof(dev.attr.owner));
+		strncpy(dev.owner, temp2, sizeof(dev.owner));
 
 		temp2 = strsep(&temp, ":");
-		strncpy(dev.attr.group, temp2, sizeof(dev.attr.owner));
+		strncpy(dev.group, temp2, sizeof(dev.owner));
 
-		dev.attr.mode = strtol(temp, NULL, 8);
+		dev.mode = strtol(temp, NULL, 8);
 
 		dbg_parse("name = %s, owner = %s, group = %s, mode = %#o",
-				dev.attr.name, dev.attr.owner, dev.attr.group,
-				dev.attr.mode);
+				dev.name, dev.owner, dev.group,
+				dev.mode);
 		retval = add_dev(&dev);
 		if (retval) {
 			dbg("add_dev returned with error %d", retval);
@@ -531,23 +527,25 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 			retval = -1;
 		}
 
+#ifndef __KLIBC__
 		if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
 			dbg("callout program status 0x%x", status);
 			retval = -1;
 		}
+#endif
 	}
 	return retval;
 }
 
-static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *attr)
+static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
 	struct list_head *tmp;
 	int retval = 0;
 	int found;
 
-	attr->mode = 0;
+	udev->mode = 0;
 	if (class_dev->sysdevice) {
-		dbg_parse("class_dev->sysdevice->directory->path = '%s'", class_dev->sysdevice->directory->path);
+		dbg_parse("class_dev->sysdevice->path = '%s'", class_dev->sysdevice->path);
 		dbg_parse("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
 	} else {
 		dbg_parse("class_dev->name = '%s'", class_dev->name);
@@ -557,19 +555,21 @@ static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *at
 		switch (dev->type) {
 		case LABEL:
 			{
-			char *temp;
+			struct sysfs_attribute *tmpattr = NULL;
+			struct sysfs_class_device *class_dev_parent = NULL;
+			char *temp = NULL;
 
 			dbg_parse("LABEL: match file '%s' with value '%s'",
 					dev->sysfs_file, dev->sysfs_value);
 			/* try to find the attribute in the class device directory */
-			temp = sysfs_get_value_from_attributes(class_dev->directory->attributes, dev->sysfs_file);
-			if (temp)
+			tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
+			if (tmpattr)
 				goto label_found;
 
-			/* look in the class device device directory if present */
+			/* look in the class device directory if present */
 			if (class_dev->sysdevice) {
-				temp = sysfs_get_value_from_attributes(class_dev->sysdevice->directory->attributes, dev->sysfs_file);
-				if (temp)
+				tmpattr = sysfs_get_device_attr(class_dev->sysdevice, dev->sysfs_file);
+				if (tmpattr)
 					goto label_found;
 			}
 
@@ -577,14 +577,13 @@ static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *at
 			 * as block partitions don't point to the physical device.  Need to fix that
 			 * up in the kernel...
 			 */
-			if (strstr(class_dev->directory->path, "block")) {
+			if (strstr(class_dev->path, "block")) {
 				dbg_parse("looking at block device...");
-				if (isdigit(class_dev->directory->path[strlen(class_dev->directory->path)-1])) {
+				if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
 					char path[SYSFS_PATH_MAX];
-					struct sysfs_class_device *class_dev_parent;
 
 					dbg_parse("really is a partition...");
-					strcpy(path, class_dev->directory->path);
+					strcpy(path, class_dev->path);
 					temp = strrchr(path, '/');
 					*temp = 0x00;
 					dbg_parse("looking for a class device at '%s'", path);
@@ -596,45 +595,48 @@ static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *at
 					dbg_parse("class_dev_parent->name = %s", class_dev_parent->name);
 
 					/* try to find the attribute in the class device directory */
-					temp = sysfs_get_value_from_attributes(class_dev_parent->directory->attributes, dev->sysfs_file);
-					if (temp) {
-						//sysfs_close_class_device(class_dev_parent);
+					tmpattr = sysfs_get_classdev_attr(class_dev_parent, dev->sysfs_file);
+					if (tmpattr) 
 						goto label_found;
-					}
 
-					/* look in the class device device directory if present */
+					/* look in the class device directory if present */
 					if (class_dev_parent->sysdevice) {
-						temp = sysfs_get_value_from_attributes(class_dev_parent->sysdevice->directory->attributes, dev->sysfs_file);
-						if (temp) {
-							// sysfs_close_class_device(class_dev_parent);
+						tmpattr = sysfs_get_device_attr(class_dev_parent->sysdevice, dev->sysfs_file);
+						if (tmpattr) 
 							goto label_found;
-						}
 					}
 					
 				}
 			}
+			if (class_dev_parent)
+				sysfs_close_class_device(class_dev_parent);
+
 			continue;
 
 label_found:
-			temp[strlen(temp)-1] = 0x00;
-			dbg_parse("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, temp, dev->sysfs_value);
-			if (strcmp(dev->sysfs_value, temp) != 0)
+			tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
+			dbg_parse("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, tmpattr->value, dev->sysfs_value);
+			if (strcmp(dev->sysfs_value, tmpattr->value) != 0) {
+				if (class_dev_parent) 
+					sysfs_close_class_device(class_dev_parent);
 				continue;
+			}
 
-			strcpy(attr->name, dev->attr.name);
-			if (isdigit(class_dev->directory->path[strlen(class_dev->directory->path)-1])) {
-				temp[0] = class_dev->directory->path[strlen(class_dev->directory->path)-1];
-				temp[1] = 0x00;
-				strcat(attr->name, temp);
+			strcpy(udev->name, dev->name);
+			if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
+				temp = &class_dev->path[strlen(class_dev->path)-1];
+				strcat(udev->name, temp);
 			}
-			if (dev->attr.mode != 0) {
-				attr->mode = dev->attr.mode;
-				strcpy(attr->owner, dev->attr.owner);
-				strcpy(attr->group, dev->attr.group);
+			if (dev->mode != 0) {
+				udev->mode = dev->mode;
+				strcpy(udev->owner, dev->owner);
+				strcpy(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, attr->name, 
-				dev->attr.owner, dev->attr.group, dev->attr.mode);
+				dev->sysfs_file, dev->sysfs_value, udev->name, 
+				dev->owner, dev->group, dev->mode);
+			if (class_dev_parent)
+				sysfs_close_class_device(class_dev_parent);
 			goto done;
 			break;
 			}
@@ -646,7 +648,7 @@ label_found:
 			found = 0;
 			if (!class_dev->sysdevice)
 				continue;
-			strcpy(path, class_dev->sysdevice->directory->path);
+			strcpy(path, class_dev->sysdevice->path);
 			temp = strrchr(path, '/');
 			dbg_parse("NUMBER path = '%s'", path);
 			dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
@@ -662,15 +664,15 @@ label_found:
 			if (!found)
 				continue;
 
-			strcpy(attr->name, dev->attr.name);
-			if (dev->attr.mode != 0) {
-				attr->mode = dev->attr.mode;
-				strcpy(attr->owner, dev->attr.owner);
-				strcpy(attr->group, dev->attr.group);
+			strcpy(udev->name, dev->name);
+			if (dev->mode != 0) {
+				udev->mode = dev->mode;
+				strcpy(udev->owner, dev->owner);
+				strcpy(udev->group, dev->group);
 			}
 			dbg_parse("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-				dev->id, attr->name, 
-				dev->attr.owner, dev->attr.group, dev->attr.mode);
+				dev->id, udev->name, 
+				dev->owner, dev->group, dev->mode);
 			goto done;
 			break;
 			}
@@ -682,7 +684,7 @@ label_found:
 			if (!class_dev->sysdevice)
 				continue;
 			found = 0;	
-			strcpy(path, class_dev->sysdevice->directory->path);
+			strcpy(path, class_dev->sysdevice->path);
 			temp = strrchr(path, '/');
 			dbg_parse("TOPOLOGY path = '%s'", path);
 			dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
@@ -698,15 +700,15 @@ label_found:
 			if (!found)
 				continue;
 
-			strcpy(attr->name, dev->attr.name);
-			if (dev->attr.mode != 0) {
-				attr->mode = dev->attr.mode;
-				strcpy(attr->owner, dev->attr.owner);
-				strcpy(attr->group, dev->attr.group);
+			strcpy(udev->name, dev->name);
+			if (dev->mode != 0) {
+				udev->mode = dev->mode;
+				strcpy(udev->owner, dev->owner);
+				strcpy(udev->group, dev->group);
 			}
 			dbg_parse("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-				dev->place, attr->name, 
-				dev->attr.owner, dev->attr.group, dev->attr.mode);
+				dev->place, udev->name, 
+				dev->owner, dev->group, dev->mode);
 			goto done;
 			break;
 			}
@@ -718,30 +720,30 @@ label_found:
 				continue;
 			if (strncmp(value, dev->id, sizeof(value)) != 0)
 				continue;
-			strcpy(attr->name, dev->attr.name);
-			if (dev->attr.mode != 0) {
-				attr->mode = dev->attr.mode;
-				strcpy(attr->owner, dev->attr.owner);
-				strcpy(attr->group, dev->attr.group);
+			strcpy(udev->name, dev->name);
+			if (dev->mode != 0) {
+				udev->mode = dev->mode;
+				strcpy(udev->owner, dev->owner);
+				strcpy(udev->group, dev->group);
 			}
 			dbg_parse("device callout '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-				dev->id, attr->name, 
-				dev->attr.owner, dev->attr.group, dev->attr.mode);
+				dev->id, udev->name, 
+				dev->owner, dev->group, dev->mode);
 			goto done;
 			break;
 			}
 		case REPLACE:
 			if (strcmp(dev->kernel_name, class_dev->name) != 0)
 				continue;
-			strcpy(attr->name, dev->attr.name);
-			if (dev->attr.mode != 0) {
-				attr->mode = dev->attr.mode;
-				strcpy(attr->owner, dev->attr.owner);
-				strcpy(attr->group, dev->attr.group);
+			strcpy(udev->name, dev->name);
+			if (dev->mode != 0) {
+				udev->mode = dev->mode;
+				strcpy(udev->owner, dev->owner);
+				strcpy(udev->group, dev->group);
 			}
 			dbg_parse("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
-				dev->kernel_name, attr->name, 
-				dev->attr.owner, dev->attr.group, dev->attr.mode);
+				dev->kernel_name, udev->name, 
+				dev->owner, dev->group, dev->mode);
 			goto done;
 			break;
 		case KERNEL_NAME:
@@ -751,23 +753,23 @@ label_found:
 			break;
 		}	
 	}
-	strcpy(attr->name, class_dev->name);
+	strcpy(udev->name, class_dev->name);
 
 done:
 	/* mode was never set above */
-	if (!attr->mode) {
-		attr->mode = get_default_mode(class_dev);
-		attr->owner[0] = 0x00;
-		attr->group[0] = 0x00;
+	if (!udev->mode) {
+		udev->mode = get_default_mode(class_dev);
+		udev->owner[0] = 0x00;
+		udev->group[0] = 0x00;
 	}
 	return retval;
 }
 
-int namedev_name_device(struct sysfs_class_device *class_dev, struct device_attr *attr)
+int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev)
 {
 	int retval;
 
-	retval = get_attr(class_dev, attr);
+	retval = get_attr(class_dev, dev);
 	if (retval)
 		dbg("get_attr failed");