X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=b8243682a71d05ee2c3e5cd13271d22958ed64ee;hp=b6d9a7f8e20085f374df36a6ba554df034d4639e;hb=03e64c8f8cc426d80db00291821cd6b645f20e05;hpb=19dc5d4ce15ad387031ec4e78dc615a9eb07dc08

diff --git a/namedev.c b/namedev.c
index b6d9a7f8e..b8243682a 100644
--- a/namedev.c
+++ b/namedev.c
@@ -41,41 +41,6 @@
 #define TYPE_TOPOLOGY	"TOPOLOGY"
 #define TYPE_REPLACE	"REPLACE"
 
-enum config_type {
-	KERNEL_NAME	= 0,	/* must be 0 to let memset() default to this value */
-	LABEL		= 1,
-	NUMBER		= 2,
-	TOPOLOGY	= 3,
-	REPLACE		= 4,
-};
-
-#define BUS_SIZE	30
-#define FILE_SIZE	50
-#define VALUE_SIZE	100
-#define ID_SIZE		50
-#define PLACE_SIZE	50
-
-
-struct config_device {
-	struct list_head node;
-
-	enum config_type type;
-
-	char bus[BUS_SIZE];
-	char sysfs_file[FILE_SIZE];
-	char sysfs_value[VALUE_SIZE];
-	char id[ID_SIZE];
-	char place[PLACE_SIZE];
-	char kernel_name[NAME_SIZE];
-	
-	/* what to set the device to */
-	int mode;
-	char name[NAME_SIZE];
-	char owner[OWNER_SIZE];
-	char group[GROUP_SIZE];
-};
-
-
 static LIST_HEAD(config_device_list);
 
 static void dump_dev(struct config_device *dev)
@@ -84,32 +49,32 @@ static void dump_dev(struct config_device *dev)
 	case KERNEL_NAME:
 		dbg("KERNEL name ='%s'"
 			" owner = '%s', group = '%s', mode = '%#o'",
-			dev->name, 
-			dev->owner, dev->group, dev->mode);
+			dev->attr.name, 
+			dev->attr.owner, dev->attr.group, dev->attr.mode);
 		break;
 	case LABEL:
 		dbg("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);
+			dev->attr.name, dev->bus, dev->sysfs_file, dev->sysfs_value,
+			dev->attr.owner, dev->attr.group, dev->attr.mode);
 		break;
 	case NUMBER:
 		dbg("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);
+			dev->attr.name, dev->bus, dev->id,
+			dev->attr.owner, dev->attr.group, dev->attr.mode);
 		break;
 	case TOPOLOGY:
 		dbg("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);
+			dev->attr.name, dev->bus, dev->place,
+			dev->attr.owner, dev->attr.group, dev->attr.mode);
 		break;
 	case REPLACE:
 		dbg("REPLACE name = %s, kernel_name = %s"
 			" owner = '%s', group = '%s', mode = '%#o'",
-			dev->name, dev->kernel_name,
-			dev->owner, dev->group, dev->mode);
+			dev->attr.name, dev->kernel_name,
+			dev->attr.owner, dev->attr.group, dev->attr.mode);
 		break;
 	default:
 		dbg("Unknown type of device!");
@@ -133,18 +98,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->name, new_dev->name) == 0) {
+		if (strcmp(dev->attr.name, new_dev->attr.name) == 0) {
 			/* the same, copy the new info into this structure */
 			copy_var(dev, new_dev, type);
-			copy_var(dev, new_dev, mode);
+			copy_var(dev, new_dev, attr.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);
+			copy_string(dev, new_dev, attr.owner);
+			copy_string(dev, new_dev, attr.group);
 			return 0;
 		}
 	}
@@ -286,9 +251,9 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.name, temp3);
+			strcpy(dev.attr.name, temp3);
 
-			dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'", dev.name, dev.bus, dev.sysfs_file, dev.sysfs_value);
+			dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'", dev.attr.name, dev.bus, dev.sysfs_file, dev.sysfs_value);
 		}
 
 		if (strcasecmp(temp2, TYPE_NUMBER) == 0) {
@@ -313,9 +278,9 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.name, temp3);
+			strcpy(dev.attr.name, temp3);
 
-			dbg("NUMBER name = '%s', bus = '%s', id = '%s'", dev.name, dev.bus, dev.id);
+			dbg("NUMBER name = '%s', bus = '%s', id = '%s'", dev.attr.name, dev.bus, dev.id);
 		}
 
 		if (strcasecmp(temp2, TYPE_TOPOLOGY) == 0) {
@@ -340,9 +305,9 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.name, temp3);
+			strcpy(dev.attr.name, temp3);
 
-			dbg("TOPOLOGY name = '%s', bus = '%s', place = '%s'", dev.name, dev.bus, dev.place);
+			dbg("TOPOLOGY name = '%s', bus = '%s', place = '%s'", dev.attr.name, dev.bus, dev.place);
 		}
 
 		if (strcasecmp(temp2, TYPE_REPLACE) == 0) {
@@ -360,8 +325,8 @@ static int namedev_init_config(void)
 			retval = get_value("NAME", &temp, &temp3);
 			if (retval)
 				continue;
-			strcpy(dev.name, temp3);
-			dbg("REPLACE name = %s, kernel_name = %s", dev.name, dev.kernel_name);
+			strcpy(dev.attr.name, temp3);
+			dbg("REPLACE name = %s, kernel_name = %s", dev.attr.name, dev.kernel_name);
 		}
 
 		retval = add_dev(&dev);
@@ -420,17 +385,17 @@ static int namedev_init_permissions(void)
 
 		/* parse the line */
 		temp2 = strsep(&temp, ":");
-		strncpy(dev.name, temp2, sizeof(dev.name));
+		strncpy(dev.attr.name, temp2, sizeof(dev.attr.name));
 
 		temp2 = strsep(&temp, ":");
-		strncpy(dev.owner, temp2, sizeof(dev.owner));
+		strncpy(dev.attr.owner, temp2, sizeof(dev.attr.owner));
 
 		temp2 = strsep(&temp, ":");
-		strncpy(dev.group, temp2, sizeof(dev.owner));
+		strncpy(dev.attr.group, temp2, sizeof(dev.attr.owner));
 
-		dev.mode = strtol(temp, NULL, 8);
+		dev.attr.mode = strtol(temp, NULL, 8);
 
-		dbg("name = %s, owner = %s, group = %s, mode = %#o", dev.name, dev.owner, dev.group, dev.mode);
+		dbg("name = %s, owner = %s, group = %s, mode = %#o", dev.attr.name, dev.attr.owner, dev.attr.group, dev.attr.mode);
 		retval = add_dev(&dev);
 		if (retval) {
 			dbg("add_dev returned with error %d", retval);
@@ -454,24 +419,186 @@ static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *at
 {
 	struct list_head *tmp;
 	int retval = 0;
+	int found;
 
+	if (class_dev->sysdevice) {
+		dbg("class_dev->sysdevice->directory->path = '%s'", class_dev->sysdevice->directory->path);
+		dbg("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
+	} else {
+		dbg("class_dev->name = '%s'", class_dev->name);
+	}
 	list_for_each(tmp, &config_device_list) {
 		struct config_device *dev = list_entry(tmp, struct config_device, node);
-		if (strcmp(dev->name, class_dev->name) == 0) {
-			attr->mode = dev->mode;
-			strcpy(attr->owner, dev->owner);
-			strcpy(attr->group, dev->group);
-			/* FIXME  put the proper name here!!! */
-			strcpy(attr->name, dev->name);
-			dbg("%s - owner = %s, group = %s, mode = %#o", dev->name, dev->owner, dev->group, dev->mode);
-			goto exit;
-		}
+		switch (dev->type) {
+		case LABEL:
+			{
+			char *temp;
+
+			dbg("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)
+				goto label_found;
+
+			/* look in the class device device directory if present */
+			if (class_dev->sysdevice) {
+				temp = sysfs_get_value_from_attributes(class_dev->sysdevice->directory->attributes, dev->sysfs_file);
+				if (temp)
+					goto label_found;
+			}
+
+			/* bah, let's go backwards up a level to see if the device is there,
+			 * 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")) {
+				dbg("looking at block device...");
+				if (isdigit(class_dev->directory->path[strlen(class_dev->directory->path)-1])) {
+					char path[SYSFS_PATH_MAX];
+					struct sysfs_class_device *class_dev_parent;
+
+					dbg("really is a partition...");
+					strcpy(path, class_dev->directory->path);
+					temp = strrchr(path, '/');
+					*temp = 0x00;
+					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 failed");
+						continue;
+					}
+					dbg("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);
+						goto label_found;
+					}
+
+					/* look in the class device 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);
+							goto label_found;
+						}
+					}
+					
+				}
+			}
+			continue;
+						
+label_found:
+			dbg("file '%s' found with value '%s'", dev->sysfs_file, temp);
+			if (strcmp(dev->sysfs_value, temp) != 0)
+				continue;
+
+			strcpy(attr->name, dev->attr.name);
+			attr->mode = dev->attr.mode;
+			strcpy(attr->owner, dev->attr.owner);
+			strcpy(attr->group, dev->attr.group);
+			dbg("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);
+			return retval;
+dbg("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);
+			break;
+			}
+		case NUMBER:
+			{
+			char path[SYSFS_PATH_MAX];
+			char *temp;
+
+			found = 0;
+			if (!class_dev->sysdevice)
+				continue;
+			strcpy(path, class_dev->sysdevice->directory->path);
+			temp = strrchr(path, '/');
+			dbg("NUMBER path = '%s'", path);
+			dbg("NUMBER temp = '%s' id = '%s'", temp, dev->id);
+			if (strstr(temp, dev->id) != NULL) {
+				found = 1;
+			} else {
+				*temp = 0x00;
+				temp = strrchr(path, '/');
+				dbg("TOPOLOGY temp = '%s' id = '%s'", temp, dev->id);
+				if (strstr(temp, dev->id) != NULL)
+					found = 1;
+			}
+			if (!found)
+				continue;
+
+			strcpy(attr->name, dev->attr.name);
+			attr->mode = dev->attr.mode;
+			strcpy(attr->owner, dev->attr.owner);
+			strcpy(attr->group, dev->attr.group);
+			dbg("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+				dev->id, attr->name, 
+				dev->attr.owner, dev->attr.group, dev->attr.mode);
+			return retval;
+			break;
+			}
+		case TOPOLOGY:
+			{
+			char path[SYSFS_PATH_MAX];
+			char *temp;
+
+			if (!class_dev->sysdevice)
+				continue;
+			found = 0;	
+			strcpy(path, class_dev->sysdevice->directory->path);
+			temp = strrchr(path, '/');
+			dbg("TOPOLOGY path = '%s'", path);
+			dbg("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
+			if (strstr(temp, dev->place) != NULL) {
+				found = 1;
+			} else {
+				*temp = 0x00;
+				temp = strrchr(path, '/');
+				dbg("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
+				if (strstr(temp, dev->place) != NULL)
+					found = 1;
+			}
+			if (!found)
+				continue;
+
+			strcpy(attr->name, dev->attr.name);
+			attr->mode = dev->attr.mode;
+			strcpy(attr->owner, dev->attr.owner);
+			strcpy(attr->group, dev->attr.group);
+			dbg("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+				dev->place, attr->name, 
+				dev->attr.owner, dev->attr.group, dev->attr.mode);
+			return retval;
+			break;
+			}
+		case REPLACE:
+			if (strcmp(dev->kernel_name, class_dev->name) != 0)
+				continue;
+			strcpy(attr->name, dev->attr.name);
+			attr->mode = dev->attr.mode;
+			strcpy(attr->owner, dev->attr.owner);
+			strcpy(attr->group, dev->attr.group);
+			dbg("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+				dev->kernel_name, attr->name, 
+				dev->attr.owner, dev->attr.group, dev->attr.mode);
+			return retval;
+			break;
+		case KERNEL_NAME:
+			break;
+		default:
+			dbg("Unknown type of device '%d'", dev->type);
+			break;
+		}	
 	}
 	attr->mode = get_default_mode(class_dev);
 	attr->owner[0] = 0x00;
 	attr->group[0] = 0x00;
 	strcpy(attr->name, class_dev->name);
-exit:
 	return retval;
 }