X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=e4e585b5cd64b5676a3261a736c6b620f3a6dad5;hp=0e1af9385fac995862570c30bddd9c464f63c287;hb=3a8c51a771b5c67d5cf0002980254ef175668630;hpb=8ffb636f013a193688b132b8512e77b0747c41a1

diff --git a/namedev.c b/namedev.c
index 0e1af9385..e4e585b5c 100644
--- a/namedev.c
+++ b/namedev.c
@@ -29,12 +29,14 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <errno.h>
+#include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 
 #include "list.h"
 #include "udev.h"
 #include "udev_version.h"
+#include "logging.h"
 #include "namedev.h"
 #include "libsysfs/libsysfs.h"
 #include "klibc_fixups.h"
@@ -45,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);
 				}
 			}
 		}
@@ -82,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;
 	}
@@ -139,16 +142,32 @@ static struct perm_device *find_perm(char *name)
 	return NULL;
 }
 
-static mode_t get_default_mode(struct sysfs_class_device *class_dev)
+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)
+{
+	if (strlen(default_owner_str) == 0)
+		strncpy(default_owner_str, "root", OWNER_SIZE);
+
+	return default_owner_str;
+}
+
+static char *get_default_group(void)
+{
+	if (strlen(default_group_str) == 0)
+		strncpy(default_group_str, "root", GROUP_SIZE);
+
+	return default_group_str;
+}
+
 static void apply_format(struct udevice *udev, unsigned char *string)
 {
 	char temp[NAME_SIZE];
@@ -195,16 +214,6 @@ static void apply_format(struct udevice *udev, unsigned char *string)
 				strcat(pos, udev->kernel_number);
 				dbg("substitute kernel number '%s'", udev->kernel_number);
 				break;
-			case 'D':
-				if (strlen(udev->kernel_number) == 0) {
-					strcat(pos, "disc");
-					dbg("substitute devfs disc");
-					break;
-				}
-				strcat(pos, "part");
-				strcat(pos, udev->kernel_number);
-				dbg("substitute devfs part '%s'", udev->kernel_number);
-				break;
 			case 'm':
 				sprintf(pos, "%u", udev->minor);
 				dbg("substitute minor number '%u'", udev->minor);
@@ -294,16 +303,29 @@ static void wait_for_device_to_initialize(struct sysfs_device *sysfs_device)
 				/* sleep to give the kernel a chance to create the file */
 				sleep(1);
 			}
-			dbg("Timed out waiting for '%s' file, continuing on anyway...", b->file);
+			dbg("timed out waiting for '%s' file, continuing on anyway...", b->file);
 			goto exit;
 		}
 		b++;
 	}
-	dbg("Did not find bus type '%s' on list of bus_id_files, contact greg@kroah.com", sysfs_device->bus);
+	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;
@@ -324,12 +346,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 */
@@ -345,16 +363,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);
+			retval = execv(path, main_argv);
 		}
-		if (retval != 0) {
-			dbg("child execve failed");
-			exit(1);
-		}
-		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;
@@ -451,32 +469,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)
@@ -514,11 +520,8 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
 {
 	struct sysfs_device *sysfs_device;
 	struct sysfs_class_device *class_dev_parent;
+	struct timespec tspec;
 	int loop;
-	char filename[SYSFS_PATH_MAX + 6];
-	int retval;
-	char *temp;
-	int partition = 0;
 
 	/* Figure out where the device symlink is at.  For char devices this will
 	 * always be in the class_dev->path.  But for block devices, it's different.
@@ -529,117 +532,70 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
 	 * symlink yet.  We do sit and spin on waiting for them right now, we should
 	 * possibly have a whitelist for these devices here...
 	 */
-	strcpy(filename, class_dev->path);
-	dbg("filename = %s", filename);
-	if (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) {
-		if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
-			temp = strrchr(filename, '/');
-			if (temp) {
-				char *temp2 = strrchr(filename, '/');
-				partition = 1;
-				*temp = 0x00;
-				dbg("temp2 = %s", temp2);
-				if (temp2 && (strcmp(temp2, "/block") == 0)) {
-					/* oops, we have no parent block device, so go back to original directory */
-					strcpy(filename, class_dev->path);
-					partition = 0;
-				}
-			}
-		}
-	}
-	strcat(filename, "/device");
+	class_dev_parent = sysfs_get_classdev_parent(class_dev);
+	if (class_dev_parent) 
+		dbg("Really a partition");
 
-	loop = 2;
+	tspec.tv_sec = 0;
+	tspec.tv_nsec = 10000000;  /* sleep 10 millisec */
+	loop = 10;
 	while (loop--) {
-		struct stat buf;
-		dbg("looking for '%s'", filename);
-		retval = stat(filename, &buf);
-		if (!retval)
-			break;
-		/* sleep to give the kernel a chance to create the device file */
-		sleep(1);
-	}
+		nanosleep(&tspec, NULL);
+		if (class_dev_parent)
+			sysfs_device = sysfs_get_classdev_device(class_dev_parent);
+		else
+			sysfs_device = sysfs_get_classdev_device(class_dev);
 
-	loop = 1;	/* FIXME put a real value in here for when everything is fixed... */
-	while (loop--) {
-		/* find the sysfs_device for this class device */
-		/* Wouldn't it really be nice if libsysfs could do this for us? */
-		sysfs_device = sysfs_get_classdev_device(class_dev);
 		if (sysfs_device != NULL)
-			goto exit;
-
-		/* if it's a partition, we need to get the parent device */
-		if (partition) {
-			/* FIXME  HACK HACK HACK HACK
-			 * for some reason partitions need this extra sleep here, in order
-			 * to wait for the device properly.  Once the libsysfs code is
-			 * fixed properly, this sleep should go away, and we can just loop above.
-			 */
-			sleep(1);
-			dbg("really is a partition");
-			class_dev_parent = sysfs_get_classdev_parent(class_dev);
-			if (class_dev_parent == NULL) {
-				dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
-			} else {
-				dbg("class_dev_parent->name='%s'", class_dev_parent->name);
-				sysfs_device = sysfs_get_classdev_device(class_dev_parent);
-				if (sysfs_device != NULL)
-					goto exit;
-			}
+			goto device_found;
+	}
+	dbg("timed out waiting for device symlink, continuing on anyway...");
+	
+device_found:
+        /* We have another issue with just the wait above - the sysfs part of
+	 * the kernel may not be quick enough to have created the link to the
+	 * device under the "bus" subsystem. Due to this, the sysfs_device->bus
+	 * will not contain the actual bus name :(
+	 *
+	 * Libsysfs now provides a new API sysfs_get_device_bus(), so use it
+	 * if needed
+	 */
+        if (sysfs_device) {
+		if (sysfs_device->bus[0] != '\0')
+			goto bus_found;
+
+		loop = 10;
+		tspec.tv_nsec = 10000000;
+		while (loop--) {
+			nanosleep(&tspec, NULL);
+			sysfs_get_device_bus(sysfs_device);
+			
+			if (sysfs_device->bus[0] != '\0')
+				goto bus_found;
 		}
-		/* sleep to give the kernel a chance to create the link */
-		/* FIXME remove comment...
-		sleep(1); */
+		dbg("timed out waiting to find the device bus, continuing on anyway");
+		goto exit;
+bus_found:
+		dbg("device %s is registered with bus '%s'",
+				sysfs_device->name, sysfs_device->bus);
 	}
-	dbg("Timed out waiting for device symlink, continuing on anyway...");
 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");
 			}
@@ -650,7 +606,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");
 			}
@@ -661,7 +617,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");
 			}
@@ -672,7 +628,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");
 			}
@@ -683,7 +639,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");
 			}
@@ -695,7 +651,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");
 			}
@@ -708,23 +664,74 @@ 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);
+	}
+
+}
+
+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;
 
-		/* Yup, this rule belongs to us! */
-		dbg("found matching rule, '%s' becomes '%s'", dev->kernel, dev->name);
-		strfieldcpy(udev->name, dev->name);
-		strfieldcpy(udev->symlink, dev->symlink);
-		goto found;
+	/* 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 */
@@ -744,9 +751,9 @@ done:
 		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;
+		udev->mode = get_default_mode();
+		strncpy(udev->owner, get_default_owner(), OWNER_SIZE);
+		strncpy(udev->group, get_default_group(), GROUP_SIZE);
 	}
 	dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
 	    udev->name, udev->owner, udev->group, udev->mode);