X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.c;h=f138fe976955fe99bb3c24318acb132369619c1b;hb=7a4877bf6fea5f1d1d8390b7efd6b8a53003631a;hp=7fd69f7778954332ab2075232fa98b7297b58001;hpb=765cbd97599d943adc73d03f4c91bd7cf7ef7fab;p=elogind.git

diff --git a/namedev.c b/namedev.c
index 7fd69f777..f138fe976 100644
--- a/namedev.c
+++ b/namedev.c
@@ -47,34 +47,35 @@ LIST_HEAD(perm_device_list);
 /* compare string with pattern (supports * ? [0-9] [!A-Z]) */
 static int strcmp_pattern(const char *p, const char *s)
 {
-	if (*s == '\0') {
-		while (*p == '*')
+	if (s[0] == '\0') {
+		while (p[0] == '*')
 			p++;
-		return (*p != '\0');
+		return (p[0] != '\0');
 	}
-	switch (*p) {
+	switch (p[0]) {
 	case '[':
 		{
 			int not = 0;
 			p++;
-			if (*p == '!') {
+			if (p[0] == '!') {
 				not = 1;
 				p++;
 			}
-			while (*p && (*p != ']')) {
+			while ((p[0] != '\0') && (p[0] != ']')) {
 				int match = 0;
 				if (p[1] == '-') {
-					if ((*s >= *p) && (*s <= p[2]))
+					if ((s[0] >= p[0]) && (s[0] <= p[2]))
 						match = 1;
 					p += 3;
 				} else {
-					match = (*p == *s);
+					match = (p[0] == s[0]);
 					p++;
 				}
 				if (match ^ not) {
-					while (*p && (*p != ']'))
+					while ((p[0] != '\0') && (p[0] != ']'))
 						p++;
-					return strcmp_pattern(p+1, s+1);
+					if (p[0] == ']')
+						return strcmp_pattern(p+1, s+1);
 				}
 			}
 		}
@@ -84,12 +85,12 @@ static int strcmp_pattern(const char *p, const char *s)
 			return strcmp_pattern(p+1, s);
 		return 0;
 	case '\0':
-		if (*s == '\0') {
+		if (s[0] == '\0') {
 			return 0;
 		}
 		break;
 	default:
-		if ((*p == *s) || (*p == '?'))
+		if ((p[0] == s[0]) || (p[0] == '?'))
 			return strcmp_pattern(p+1, s+1);
 		break;
 	}
@@ -111,7 +112,7 @@ int add_perm_dev(struct perm_device *new_dev)
 
 	/* update the values if we already have the device */
 	list_for_each_entry(dev, &perm_device_list, node) {
-		if (strcmp_pattern(new_dev->name, dev->name))
+		if (strcmp(new_dev->name, dev->name))
 			continue;
 		copy_var(dev, new_dev, mode);
 		copy_string(dev, new_dev, owner);
@@ -145,25 +146,25 @@ static mode_t get_default_mode(void)
 {
 	mode_t mode = 0600;	/* default to owner rw only */
 
-	if (strlen(default_mode_str) != 0) {
+	if (strlen(default_mode_str) != 0)
 		mode = strtol(default_mode_str, NULL, 8);
-	}
+
 	return mode;
 }
 
-static char * get_default_owner(void)
+static char *get_default_owner(void)
 {
-	if (strlen(default_owner_str) == 0) {
+	if (strlen(default_owner_str) == 0)
 		strncpy(default_owner_str, "root", OWNER_SIZE);
-	}
+
 	return default_owner_str;
 }
 
-static char * get_default_group(void)
+static char *get_default_group(void)
 {
-	if (strlen(default_group_str) == 0) {
+	if (strlen(default_group_str) == 0)
 		strncpy(default_group_str, "root", GROUP_SIZE);
-	}
+
 	return default_group_str;
 }
 
@@ -259,12 +260,17 @@ static void apply_format(struct udevice *udev, unsigned char *string)
 	}
 }
 
+/* 
+ * Note, we can have multiple files for different busses in here due
+ * to the mess that USB has for its device tree...
+ */
 static struct bus_file {
 	char *bus;
 	char *file;
 } bus_files[] = {
 	{ .bus = "scsi",	.file = "vendor" },
 	{ .bus = "usb",		.file = "idVendor" },
+	{ .bus = "usb",		.file = "iInterface" },
 	{ .bus = "usb-serial",	.file = "detach_state" },
 	{ .bus = "ide",		.file = "detach_state" },
 	{ .bus = "pci",		.file = "vendor" },
@@ -284,34 +290,52 @@ static void wait_for_device_to_initialize(struct sysfs_device *sysfs_device)
 	 */
 	struct bus_file *b = &bus_files[0];
 	struct sysfs_attribute *tmpattr;
-	int loop;
+	int found = 0;
+	int loop = SECONDS_TO_WAIT_FOR_FILE;
 
 	while (1) {
-		if (b->bus == NULL)
-			break;
+		if (b->bus == NULL) {
+			if (!found)
+				break;
+			/* sleep to give the kernel a chance to create the file */
+			sleep(1);
+			--loop;
+			if (loop == 0)
+				break;
+			b = &bus_files[0];
+		}
 		if (strcmp(sysfs_device->bus, b->bus) == 0) {
-			tmpattr = NULL;
-			loop = SECONDS_TO_WAIT_FOR_FILE;
-			while (loop--) {
-				dbg("looking for file '%s' on bus '%s'", b->file, b->bus);
-				tmpattr = sysfs_get_device_attr(sysfs_device, b->file);
-				if (tmpattr) {
-					/* found it! */
-					goto exit;
-				}
-				/* sleep to give the kernel a chance to create the file */
-				sleep(1);
+			found = 1;
+			dbg("looking for file '%s' on bus '%s'", b->file, b->bus);
+			tmpattr = sysfs_get_device_attr(sysfs_device, b->file);
+			if (tmpattr) {
+				/* found it! */
+				goto exit;
 			}
-			dbg("timed out waiting for '%s' file, continuing on anyway...", b->file);
-			goto exit;
+			dbg("can't find '%s' file", b->file);
 		}
-		b++;
+		++b;
 	}
-	dbg("did not find bus type '%s' on list of bus_id_files, contact greg@kroah.com", sysfs_device->bus);
+	if (!found)
+		dbg("did not find bus type '%s' on list of bus_id_files, "
+		    "contact greg@kroah.com", sysfs_device->bus);
 exit:
 	return; /* here to prevent compiler warning... */
 }
 
+static void fix_kernel_name(struct udevice *udev)
+{
+	char *temp = udev->kernel_name;
+
+	while (*temp != 0x00) {
+		/* Some block devices have a ! in their name, 
+		 * we need to change that to / */
+		if (*temp == '!')
+			*temp = '/';
+		++temp;
+	}
+}
+
 static int execute_program(char *path, char *value, int len)
 {
 	int retval;
@@ -332,12 +356,8 @@ static int execute_program(char *path, char *value, int len)
 		return -1;
 	}
 	pid = fork();
-	if (pid == -1) {
-		dbg("fork failed");
-		return -1;
-	}
-
-	if (pid == 0) {
+	switch(pid) {
+	case 0:
 		/* child */
 		close(STDOUT_FILENO);
 		dup(fds[1]);	/* dup write side of pipe to STDOUT */
@@ -353,16 +373,16 @@ static int execute_program(char *path, char *value, int len)
 				dbg("too many args - %d", i);
 				args[i] = NULL;
 			}
-			retval = execve(args[0], args, main_envp);
+			retval = execv(args[0], args);
 		} else {
-			retval = execve(path, main_argv, main_envp);
-		}
-		if (retval != 0) {
-			dbg("child execve failed");
-			exit(1);
+			retval = execv(path, main_argv);
 		}
-		return -1; /* avoid compiler warning */
-	} else {
+		dbg("child execve failed");
+		exit(1);
+	case -1:
+		dbg("fork failed");
+		return -1;
+	default:
 		/* parent reads from fds[0] */
 		close(fds[1]);
 		retval = 0;
@@ -459,32 +479,20 @@ static int match_sysfs_pairs(struct config_device *dev, struct sysfs_class_devic
 static int match_id(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
 	char path[SYSFS_PATH_MAX];
-	int found;
 	char *temp = NULL;
 
 	/* we have to have a sysfs device for ID to work */
 	if (!sysfs_device)
 		return -ENODEV;
 
-	found = 0;
 	strfieldcpy(path, sysfs_device->path);
 	temp = strrchr(path, '/');
+	temp++;
 	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("search '%s' in '%s', path='%s'", dev->id, temp, path);
-		if (strstr(temp, dev->id) != NULL)
-			found = 1;
-	}
-	if (!found) {
-		dbg("id doesn't match");
+	if (strcmp_pattern(dev->id, temp) != 0)
 		return -ENODEV;
-	}
-
-	return 0;
+	else
+		return 0;
 }
 
 static int match_place(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
@@ -563,10 +571,9 @@ device_found:
 	 * if needed
 	 */
         if (sysfs_device) {
-		
 		if (sysfs_device->bus[0] != '\0')
 			goto bus_found;
-		
+
 		loop = 10;
 		tspec.tv_nsec = 10000000;
 		while (loop--) {
@@ -586,50 +593,19 @@ exit:
 	return sysfs_device;
 }
 
-int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *udev)
+static int match_rule(struct config_device *dev, struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
-	struct sysfs_device *sysfs_device = NULL;
-	struct config_device *dev;
-	struct perm_device *perm;
-	char *pos;
-
-	udev->mode = 0;
-
-	/* find the sysfs_device associated with this class device */
-	sysfs_device = get_sysfs_device(class_dev);
-	if (sysfs_device) {
-		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);
-		wait_for_device_to_initialize(sysfs_device);
-	} else {
-		dbg("class_dev->name = '%s'", class_dev->name);
-	}
-
-	strfieldcpy(udev->kernel_name, class_dev->name);
-
-	/* get kernel number */
-	pos = class_dev->name + strlen(class_dev->name);
-	while (isdigit(*(pos-1)))
-		pos--;
-	strfieldcpy(udev->kernel_number, pos);
-	dbg("kernel_number='%s'", udev->kernel_number);
-
-	/* look for a matching rule to apply */
-	list_for_each_entry(dev, &config_device_list, node) {
-		dbg("process rule");
-
+	while (1) {
 		/* check for matching bus value */
 		if (dev->bus[0] != '\0') {
 			if (sysfs_device == NULL) {
 				dbg("device has no bus");
-				continue;
+				goto try_parent;
 			}
 			dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
 			if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
 				dbg(FIELD_BUS " is not matching");
-				continue;
+				goto try_parent;
 			} else {
 				dbg(FIELD_BUS " matches");
 			}
@@ -640,7 +616,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 			dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'", dev->kernel, class_dev->name);
 			if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
 				dbg(FIELD_KERNEL " is not matching");
-				continue;
+				goto try_parent;
 			} else {
 				dbg(FIELD_KERNEL " matches");
 			}
@@ -651,7 +627,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 			dbg("check " FIELD_ID);
 			if (match_id(dev, class_dev, sysfs_device) != 0) {
 				dbg(FIELD_ID " is not matching");
-				continue;
+				goto try_parent;
 			} else {
 				dbg(FIELD_ID " matches");
 			}
@@ -662,7 +638,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 			dbg("check " FIELD_PLACE);
 			if (match_place(dev, class_dev, sysfs_device) != 0) {
 				dbg(FIELD_PLACE " is not matching");
-				continue;
+				goto try_parent;
 			} else {
 				dbg(FIELD_PLACE " matches");
 			}
@@ -673,7 +649,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 			dbg("check " FIELD_SYSFS " pairs");
 			if (match_sysfs_pairs(dev, class_dev, sysfs_device) != 0) {
 				dbg(FIELD_SYSFS " is not matching");
-				continue;
+				goto try_parent;
 			} else {
 				dbg(FIELD_SYSFS " matches");
 			}
@@ -685,7 +661,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 			apply_format(udev, dev->program);
 			if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
 				dbg(FIELD_PROGRAM " returned nozero");
-				continue;
+				goto try_parent;
 			} else {
 				dbg(FIELD_PROGRAM " returned successful");
 			}
@@ -698,28 +674,78 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 			    dev->result, udev->program_result);
 			if (strcmp_pattern(dev->result, udev->program_result) != 0) {
 				dbg(FIELD_RESULT " is not matching");
-				continue;
+				goto try_parent;
 			} else {
 				dbg(FIELD_RESULT " matches");
 			}
 		}
 
-		/* check if we are instructed to ignore this device */
-		if (dev->name[0] == '\0') {
-			dbg("instructed to ignore this device");
-			return -1;
-		}
+		/* Yeah, we matched! */
+		return 0;
+
+try_parent:
+		dbg("try parent sysfs device");
+		sysfs_device = sysfs_get_device_parent(sysfs_device);
+		if (sysfs_device == NULL)
+			return -ENODEV;
+		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);
+	}
 
-		/* Yup, this rule belongs to us! */
-		info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
-		    udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
-		strfieldcpy(udev->name, dev->name);
-		strfieldcpy(udev->symlink, dev->symlink);
-		goto found;
+}
+
+int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+	struct sysfs_device *sysfs_device = NULL;
+	struct config_device *dev;
+	struct perm_device *perm;
+	char *pos;
+
+	udev->mode = 0;
+
+	/* find the sysfs_device associated with this class device */
+	sysfs_device = get_sysfs_device(class_dev);
+	if (sysfs_device) {
+		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);
+		wait_for_device_to_initialize(sysfs_device);
+	}
+	dbg("class_dev->name = '%s'", class_dev->name);
+
+	strfieldcpy(udev->kernel_name, class_dev->name);
+	fix_kernel_name(udev);
+	dbg("udev->kernel_name = '%s'", udev->kernel_name);
+
+	/* get kernel number */
+	pos = class_dev->name + strlen(class_dev->name);
+	while (isdigit(*(pos-1)))
+		pos--;
+	strfieldcpy(udev->kernel_number, pos);
+	dbg("kernel_number='%s'", udev->kernel_number);
+
+	/* look for a matching rule to apply */
+	list_for_each_entry(dev, &config_device_list, node) {
+		dbg("process rule");
+		if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
+			if (dev->name[0] == '\0') {
+				info("configured rule in '%s' at line %i applied, '%s' is ignored",
+				     udev_rules_filename, dev->config_line, udev->kernel_name);
+				return -1;
+			}
+
+			info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+			     udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
+			strfieldcpy(udev->name, dev->name);
+			strfieldcpy(udev->symlink, dev->symlink);
+			goto found;
+		}
 	}
 
 	/* no rule was found so we use the kernel name */
-	strfieldcpy(udev->name, class_dev->name);
+	strfieldcpy(udev->name, udev->kernel_name);
 	goto done;
 
 found: