X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=212d6bb68d93d5774b95ef38cf3806a8dd5a690f;hp=a81721a9cf4378cd45f2517e8701ebde98f211f7;hb=666269480900dd8d099b9e188c16acc9f7f31ee5;hpb=e8bacccab296d6b75c4c9f43cb4e71007aff5b8a

diff --git a/namedev.c b/namedev.c
index a81721a9c..212d6bb68 100644
--- a/namedev.c
+++ b/namedev.c
@@ -39,18 +39,58 @@
 #include "klibc_fixups.h"
 
 LIST_HEAD(config_device_list);
+LIST_HEAD(perm_device_list);
 
-/* s2 may end with '*' to match everything */
-static int strncmp_wildcard(char *s1, char *s2, int max)
+/* compare string with pattern (supports * ? [0-9] [!A-Z]) */
+static int strcmp_pattern(const char *p, const char *s)
 {
-	int len = strlen(s2);
-	if (len > max)
-		len = max;
-	if (s2[len-1] == '*')
-		len--;
-	else
-		len = max;
-	return strncmp(s1, s2, len);
+	if (*s == '\0') {
+		while (*p == '*')
+			p++;
+		return (*p != '\0');
+	}
+	switch (*p) {
+	case '[':
+		{
+			int not = 0;
+			p++;
+			if (*p == '!') {
+				not = 1;
+				p++;
+			}
+			while (*p && (*p != ']')) {
+				int match = 0;
+				if (p[1] == '-') {
+					if ((*s >= *p) && (*s <= p[2]))
+						match = 1;
+					p += 3;
+				} else {
+					match = (*p == *s);
+					p++;
+				}
+				if (match ^ not) {
+					while (*p && (*p != ']'))
+						p++;
+					return strcmp_pattern(p+1, s+1);
+				}
+			}
+		}
+		break;
+	case '*':
+		if (strcmp_pattern(p, s+1))
+			return strcmp_pattern(p+1, s);
+		return 0;
+	case '\0':
+		if (*s == '\0') {
+			return 0;
+		}
+		break;
+	default:
+		if ((*p == *s) || (*p == '?'))
+			return strcmp_pattern(p+1, s+1);
+		break;
+	}
+	return 1;
 }
 
 #define copy_var(a, b, var)		\
@@ -69,12 +109,11 @@ int add_config_dev(struct config_device *new_dev)
 	/* 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 (strncmp_wildcard(dev->name, new_dev->name, sizeof(dev->name)))
+		if (strcmp_pattern(new_dev->name, dev->name))
 			continue;
 		if (strncmp(dev->bus, new_dev->bus, sizeof(dev->name)))
 			continue;
 		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);
@@ -82,8 +121,7 @@ int add_config_dev(struct config_device *new_dev)
 		copy_string(dev, new_dev, place);
 		copy_string(dev, new_dev, kernel_name);
 		copy_string(dev, new_dev, exec_program);
-		copy_string(dev, new_dev, owner);
-		copy_string(dev, new_dev, group);
+		copy_string(dev, new_dev, symlink);
 		return 0;
 	}
 
@@ -97,10 +135,54 @@ int add_config_dev(struct config_device *new_dev)
 	return 0;
 }
 
+int add_perm_dev(struct perm_device *new_dev)
+{
+	struct list_head *tmp;
+	struct perm_device *tmp_dev;
+
+	/* update the values if we already have the device */
+	list_for_each(tmp, &perm_device_list) {
+		struct perm_device *dev = list_entry(tmp, struct perm_device, node);
+		if (strcmp_pattern(new_dev->name, dev->name))
+			continue;
+		copy_var(dev, new_dev, mode);
+		copy_string(dev, new_dev, owner);
+		copy_string(dev, new_dev, group);
+		return 0;
+	}
+
+	/* not found, add new structure to the perm list */
+	tmp_dev = malloc(sizeof(*tmp_dev));
+	if (!tmp_dev)
+		return -ENOMEM;
+	memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
+	list_add_tail(&tmp_dev->node, &perm_device_list);
+	//dump_perm_dev(tmp_dev);
+	return 0;
+}
+
+static struct perm_device *find_perm(char *name)
+{
+	struct list_head *tmp;
+	struct perm_device *perm = NULL;
+
+	list_for_each(tmp, &perm_device_list) {
+		perm = list_entry(tmp, struct perm_device, node);
+		if (strcmp_pattern(perm->name, name))
+			continue;
+		return perm;
+	}
+	return NULL;
+}
+
 static mode_t get_default_mode(struct sysfs_class_device *class_dev)
 {
-	/* just default everyone to rw for the world! */
-	return 0666;
+	mode_t mode = 0600;	/* default to owner rw only */
+
+	if (strlen(default_mode_str) != 0) {
+		mode = strtol(default_mode_str, NULL, 8);
+	}
+	return mode;
 }
 
 static void build_kernel_number(struct sysfs_class_device *class_dev, struct udevice *udev)
@@ -118,15 +200,30 @@ static void build_kernel_number(struct sysfs_class_device *class_dev, struct ude
 static void apply_format(struct udevice *udev, unsigned char *string)
 {
 	char name[NAME_SIZE];
+	char temp[NAME_SIZE];
+	char *tail;
 	char *pos;
+	char *pos2;
+	char *pos3;
+	int num;
 
 	while (1) {
+		num = 0;
 		pos = strchr(string, '%');
 
 		if (pos) {
-			strfieldcpy(name, pos+2);
-			*pos = 0x00;
-			switch (pos[1]) {
+			*pos = '\0';
+			tail = pos+1;
+			if (isdigit(tail[0])) {
+				num = (int) strtoul(&pos[1], &tail, 10);
+				if (tail == NULL) {
+					dbg("format parsing error '%s'", pos+1);
+					break;
+				}
+			}
+			strfieldcpy(name, tail+1);
+
+			switch (tail[0]) {
 			case 'b':
 				if (strlen(udev->bus_id) == 0)
 					break;
@@ -141,7 +238,7 @@ static void apply_format(struct udevice *udev, unsigned char *string)
 				break;
 			case 'D':
 				if (strlen(udev->kernel_number) == 0) {
-					strcat(pos, "disk");
+					strcat(pos, "disc");
 					break;
 				}
 				strcat(pos, "part");
@@ -159,8 +256,24 @@ static void apply_format(struct udevice *udev, unsigned char *string)
 			case 'c':
 				if (strlen(udev->callout_value) == 0)
 					break;
-				strcat(pos, udev->callout_value);
-				dbg("substitute callout output '%s'", udev->callout_value);
+				if (num) {
+					/* get part of return string */
+					strncpy(temp, udev->callout_value, sizeof(temp));
+					pos2 = temp;
+					while (num) {
+						num--;
+						pos3 = strsep(&pos2, " ");
+						if (pos3 == NULL) {
+							dbg("requested part of callout string not found");
+							break;
+						}
+					}
+					strcat(pos, pos3);
+					dbg("substitute partial callout output '%s'", pos3);
+				} else {
+					strcat(pos, udev->callout_value);
+					dbg("substitute callout output '%s'", udev->callout_value);
+				}
 				break;
 			default:
 				dbg("unknown substitution type '%%%c'", pos[1]);
@@ -182,7 +295,7 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 	pid_t pid;
 	int value_set = 0;
 	char buffer[256];
-	char *arg;
+	char *pos;
 	char *args[CALLOUT_MAXARG];
 	int i;
 
@@ -204,9 +317,9 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 		dup(fds[1]);	/* dup write side of pipe to STDOUT */
 		if (strchr(dev->exec_program, ' ')) {
 			/* callout with arguments */
-			arg = dev->exec_program;
+			pos = dev->exec_program;
 			for (i=0; i < CALLOUT_MAXARG-1; i++) {
-				args[i] = strsep(&arg, " ");
+				args[i] = strsep(&pos, " ");
 				if (args[i] == NULL)
 					break;
 			}
@@ -242,9 +355,12 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 			} else {
 				value_set = 1;
 				strncpy(value, buffer, len);
+				pos = value + strlen(value)-1;
+				if (pos[0] == '\n')
+				pos[0] = '\0';
+				dbg("callout returned '%s'", value);
 			}
 		}
-		dbg("callout returned '%s'", value);
 		close(fds[0]);
 		res = wait(&status);
 		if (res < 0) {
@@ -282,18 +398,12 @@ static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev
 		apply_format(udev, dev->exec_program);
 		if (exec_callout(dev, udev->callout_value, NAME_SIZE))
 			continue;
-		if (strncmp_wildcard(udev->callout_value, dev->id, NAME_SIZE) != 0)
+		if (strcmp_pattern(dev->id, udev->callout_value) != 0)
 			continue;
 		strfieldcpy(udev->name, dev->name);
-		if (dev->mode != 0) {
-			udev->mode = dev->mode;
-			strfieldcpy(udev->owner, dev->owner);
-			strfieldcpy(udev->group, dev->group);
-		}
-		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);
+		strfieldcpy(udev->symlink, dev->symlink);
+		dbg("callout returned matching value '%s', '%s' becomes '%s'",
+		    dev->id, class_dev->name, udev->name);
 		return 0;
 	}
 	return -ENODEV;
@@ -304,6 +414,7 @@ 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 *c;
 
 	list_for_each(tmp, &config_device_list) {
 		dev = list_entry(tmp, struct config_device, node);
@@ -332,22 +443,18 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 		continue;
 
 label_found:
-		tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
+		c = tmpattr->value + strlen(tmpattr->value)-1;
+		if (*c == '\n')
+			*c = 0x00;
 		dbg("compare attribute '%s' value '%s' with '%s'",
 			  dev->sysfs_file, tmpattr->value, dev->sysfs_value);
-		if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
+		if (strcmp_pattern(dev->sysfs_value, tmpattr->value) != 0)
 			continue;
 
 		strfieldcpy(udev->name, dev->name);
-		if (dev->mode != 0) {
-			udev->mode = dev->mode;
-			strfieldcpy(udev->owner, dev->owner);
-			strfieldcpy(udev->group, dev->group);
-		}
-		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);
+		strfieldcpy(udev->symlink, dev->symlink);
+		dbg("found matching attribute '%s', '%s' becomes '%s' ",
+		    dev->sysfs_file, class_dev->name, udev->name);
 
 		return 0;
 	}
@@ -391,15 +498,9 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
 		if (!found)
 			continue;
 		strfieldcpy(udev->name, dev->name);
-		if (dev->mode != 0) {
-			udev->mode = dev->mode;
-			strfieldcpy(udev->owner, dev->owner);
-			strfieldcpy(udev->group, dev->group);
-		}
-		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);
+		strfieldcpy(udev->symlink, dev->symlink);
+		dbg("found matching id '%s', '%s' becomes '%s'",
+		    dev->id, class_dev->name, udev->name);
 		return 0;
 	}
 	return -ENODEV;
@@ -443,15 +544,9 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
 			continue;
 
 		strfieldcpy(udev->name, dev->name);
-		if (dev->mode != 0) {
-			udev->mode = dev->mode;
-			strfieldcpy(udev->owner, dev->owner);
-			strfieldcpy(udev->group, dev->group);
-		}
-		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);
+		strfieldcpy(udev->symlink, dev->symlink);
+		dbg("found matching place '%s', '%s' becomes '%s'",
+		    dev->place, class_dev->name, udev->name);
 		return 0;
 	}
 	return -ENODEV;
@@ -468,19 +563,12 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
 			continue;
 
 		dbg("compare name '%s' with '%s'", dev->kernel_name, class_dev->name);
-		if (strncmp_wildcard(class_dev->name, dev->kernel_name, NAME_SIZE) != 0)
+		if (strcmp_pattern(dev->kernel_name, class_dev->name) != 0)
 			continue;
 
 		strfieldcpy(udev->name, dev->name);
-		if (dev->mode != 0) {
-			udev->mode = dev->mode;
-			strfieldcpy(udev->owner, dev->owner);
-			strfieldcpy(udev->group, dev->group);
-		}
-		dbg("found name, '%s' becomes '%s'"
-		    " - owner='%s', group='%s', mode = %#o",
-		    dev->kernel_name, udev->name,
-		    dev->owner, dev->group, dev->mode);
+		strfieldcpy(udev->symlink, dev->symlink);
+		dbg("found name, '%s' becomes '%s'", dev->kernel_name, udev->name);
 		
 		return 0;
 	}
@@ -489,24 +577,8 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
 
 static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
-	struct config_device *dev;
-	struct list_head *tmp;
-	int len;
-
+	/* heh, this is pretty simple... */
 	strfieldcpy(udev->name, class_dev->name);
-	/* look for permissions */
-	list_for_each(tmp, &config_device_list) {
-		dev = list_entry(tmp, struct config_device, node);
-		len = strlen(dev->name);
-		if (strncmp_wildcard(class_dev->name, dev->name, sizeof(dev->name)))
-			continue;
-		if (dev->mode != 0) {
-			dbg("found permissions for '%s'", class_dev->name);
-			udev->mode = dev->mode;
-			strfieldcpy(udev->owner, dev->owner);
-			strfieldcpy(udev->group, dev->group);
-		}
-	}
 }
 
 int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *udev)
@@ -514,41 +586,34 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 	struct sysfs_device *sysfs_device = NULL;
 	struct sysfs_class_device *class_dev_parent = NULL;
 	int retval = 0;
-	char *temp = NULL;
+	struct perm_device *perm;
 
 	udev->mode = 0;
 
 	/* find the sysfs_device for this class device */
 	/* Wouldn't it really be nice if libsysfs could do this for us? */
-	if (class_dev->sysdevice) {
-		sysfs_device = class_dev->sysdevice;
-	} else {
+	sysfs_device = sysfs_get_classdev_device(class_dev);
+	if (sysfs_device == NULL) {
 		/* 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->path, "block")) {
+		if (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) {
 			dbg("looking at block device");
 			if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
-				char path[SYSFS_PATH_MAX];
-
 				dbg("really is a partition");
-				strfieldcpy(path, class_dev->path);
-				temp = strrchr(path, '/');
-				*temp = 0x00;
-				dbg("looking for a class device at '%s'", path);
-				class_dev_parent = sysfs_open_class_device(path);
+				class_dev_parent = sysfs_get_classdev_parent
+								   (class_dev);
 				if (class_dev_parent == NULL) {
-					dbg("sysfs_open_class_device at '%s' failed", path);
+					dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
 				} else {
 					dbg("class_dev_parent->name='%s'", class_dev_parent->name);
-					if (class_dev_parent->sysdevice)
-						sysfs_device = class_dev_parent->sysdevice;
+					sysfs_device = sysfs_get_classdev_device(class_dev_parent);
 				}
 			}
 		}
 	}
-		
+
 	if (sysfs_device) {
 		dbg("sysfs_device->path='%s'", sysfs_device->path);
 		dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
@@ -585,19 +650,24 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 	goto done;
 
 found:
-	/* substitute placeholder in NAME  */
+	/* substitute placeholder */
 	apply_format(udev, udev->name);
+	apply_format(udev, udev->symlink);
 
 done:
-	/* mode was never set above */
-	if (!udev->mode) {
+	perm = find_perm(udev->name);
+	if (perm) {
+		udev->mode = perm->mode;
+		strfieldcpy(udev->owner, perm->owner);
+		strfieldcpy(udev->group, perm->group);
+	} else {
+		/* no matching perms found :( */
 		udev->mode = get_default_mode(class_dev);
 		udev->owner[0] = 0x00;
 		udev->group[0] = 0x00;
 	}
-
-	if (class_dev_parent)
-		sysfs_close_class_device(class_dev_parent);
+	dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
+	    udev->name, udev->owner, udev->group, udev->mode);
 
 	return 0;
 }
@@ -605,7 +675,7 @@ done:
 int namedev_init(void)
 {
 	int retval;
-	
+
 	retval = namedev_init_rules();
 	if (retval)
 		return retval;
@@ -615,5 +685,6 @@ int namedev_init(void)
 		return retval;
 
 	dump_config_dev_list();
+	dump_perm_dev_list();
 	return retval;
 }