X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=52417e3793b655fcca041ff1ead58e7a0ba8d4ce;hp=7b70f8bcdfd40dea8f19dd23e23fe01a655d8666;hb=462be028f18d94ab06c913768da78e30a1a66b68;hpb=949e32f2249da55890a6a49208023df30b6b5227

diff --git a/namedev.c b/namedev.c
index 7b70f8bcd..52417e379 100644
--- a/namedev.c
+++ b/namedev.c
@@ -32,6 +32,7 @@
 #include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#include <sys/sysinfo.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
@@ -196,23 +197,21 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 	struct sysfs_attribute *tmpattr;
 
 	pos = string;
-
 	while (1) {
-		pos = strchr(string, '%');
-		if (pos != NULL) {
-			pos[0] = '\0';
-			tail = pos+1;
-			len = get_format_len(&tail);
-			c = tail[0];
-			strfieldcpy(temp, tail+1);
-			tail = temp;
-		} else {
+		pos = strchr(pos, '%');
+		if (pos == NULL)
 			break;
-		}
-		dbg("format=%c, string='%s', tail='%s'",c , string, tail);
 
+		pos[0] = '\0';
+		tail = pos+1;
+		len = get_format_len(&tail);
+		c = tail[0];
+		strfieldcpy(temp, tail+1);
+		tail = temp;
+		dbg("format=%c, string='%s', tail='%s'",c , string, tail);
 		attr = get_format_attribute(&tail);
 
+
 		switch (c) {
 		case 'b':
 			if (strlen(udev->bus_id) == 0)
@@ -283,6 +282,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 			break;
 		case '%':
 			strfieldcatmax(string, "%", maxsize);
+			pos++;
 			break;
 		default:
 			dbg("unknown substitution type '%%%c'", c);
@@ -454,7 +454,7 @@ static int execute_program(char *path, char *value, int len)
 			retval = -1;
 		}
 
-		if (i > 0 && value[i] == '\n')
+		if (i > 0 && value[i-1] == '\n')
 			i--;
 		value[i] = '\0';
 		dbg("result is '%s'", value);
@@ -602,6 +602,42 @@ static int match_place(struct config_device *dev, struct sysfs_class_device *cla
 	return 0;
 }
 
+static int whitelist_search(struct sysfs_class_device *class_dev)
+{
+	char *sysblock = "/sys/block";
+  	int i;
+
+  	static char *list[] = {
+  		"nb",
+  		"ram",
+  		"loop",
+		"fd",
+  		"md",
+		"dos_cd",
+		"double",
+  		"flash",
+		"msd",
+		"rflash",
+  		"rom",
+		"rrom",
+  		"sbpcd",
+  		"pcd",
+  		"pf",
+  		"scd",
+  		"ubd",
+		NULL,
+  	};
+
+	if (strncmp(class_dev->path, sysblock, strlen(sysblock)))
+		return 0;
+
+	for (i=0; list[i] != NULL; i++)
+		if (!strncmp(class_dev->name, list[i], strlen(list[i])))
+			return 1;
+
+	return 0;
+}
+
 static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_dev)
 {
 	struct sysfs_device *sysfs_device;
@@ -615,8 +651,8 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
 	 * all partitions have the symlink in its parent directory.
 	 * But we need to watch out for block devices that do not have parents, yet
 	 * look like a partition (fd0, loop0, etc.)  They all do not have a device
-	 * symlink yet.  We do sit and spin on waiting for them right now, we should
-	 * possibly have a whitelist for these devices here...
+	 * symlink yet.  We do sit and spin on waiting for them right now unless
+	 * they happen to be in the whitelist in which case we exit.
 	 */
 	class_dev_parent = sysfs_get_classdev_parent(class_dev);
 	if (class_dev_parent != NULL) 
@@ -626,8 +662,13 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
 	tspec.tv_nsec = 10000000;  /* sleep 10 millisec */
 	loop = 10;
 	while (loop--) {
-		if (udev_sleep)
+		if (udev_sleep) {
+			if (whitelist_search(class_dev)) {
+				sysfs_device = NULL;
+				goto exit;
+			}
 			nanosleep(&tspec, NULL);
+		}
 
 		if (class_dev_parent)
 			sysfs_device = sysfs_get_classdev_device(class_dev_parent);
@@ -776,6 +817,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 	struct sysfs_device *sysfs_device = NULL;
 	struct config_device *dev;
 	struct perm_device *perm;
+	struct sysinfo info;
 	char *pos;
 
 	udev->mode = 0;
@@ -837,33 +879,29 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 			}
 		}
 	}
-
-	/* no rule was found for the net device */
-	if (udev->type == 'n') {
-		dbg("no name for net device '%s' configured", udev->kernel_name);
-		return -1;
-	}
-
 	/* no rule was found so we use the kernel name */
 	strfieldcpy(udev->name, udev->kernel_name);
-	goto done;
+	if (udev->type == 'n')
+		goto done;
+	else
+		goto perms;
 
 found:
 	apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+	strfieldcpy(udev->config_file, dev->config_file);
+	udev->config_line = dev->config_line;
 
 	if (udev->type == 'n')
-		return 0;
+		goto done;
 
 	udev->partitions = dev->partitions;
-	strfieldcpy(udev->config_file, dev->config_file);
-	udev->config_line = dev->config_line;
 
 	/* get permissions given in rule */
 	set_empty_perms(udev, dev->mode,
 			      dev->owner,
 			      dev->group);
 
-done:
+perms:
 	/* get permissions given in config file or set defaults */
 	perm = find_perm(udev->name);
 	if (perm != NULL) {
@@ -879,8 +917,10 @@ done:
 	dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
 	    udev->name, udev->owner, udev->group, udev->mode);
 
+done:
 	/* store time of action */
-	udev->config_time = time(NULL);
+	sysinfo(&info);
+	udev->config_uptime = info.uptime;
 
 	return 0;
 }