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

diff --git a/namedev.c b/namedev.c
index 51a4639ab..52417e379 100644
--- a/namedev.c
+++ b/namedev.c
@@ -32,9 +32,7 @@
 #include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#ifndef __KLIBC__
 #include <sys/sysinfo.h>
-#endif
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
@@ -199,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)
@@ -286,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);
@@ -605,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;
@@ -618,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) 
@@ -629,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);