X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.c;h=dfeadee18a7e5100b1e3ff35ac67ec1e41cafc55;hb=d5f91372dd3241f8b4bbe2a99aaaeda541a76bad;hp=ed8d6c1808bf3c747e4b0a14be5a49f99839a2cc;hpb=aebef544cb4417bcf1dbc6d9d0ad795e5525e41c;p=elogind.git

diff --git a/namedev.c b/namedev.c
index ed8d6c180..dfeadee18 100644
--- a/namedev.c
+++ b/namedev.c
@@ -214,15 +214,15 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 			 struct sysfs_device *sysfs_device)
 {
 	char temp[NAME_SIZE];
-	char temp1[NAME_SIZE];
+	char temp2[NAME_SIZE];
 	char *tail;
 	char *pos;
-	char *pos2;
-	char *pos3;
 	char *attr;
 	int len;
 	int i;
 	char c;
+	char *spos;
+	int slen;
 	struct sysfs_attribute *tmpattr;
 
 	pos = string;
@@ -278,20 +278,18 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 			if (attr != NULL)
 				i = atoi(attr);
 			if (i > 0) {
-				strfieldcpy(temp1, udev->program_result);
-				pos2 = temp1;
-				while (i) {
+				foreach_strpart(udev->program_result, " \n\r", spos, slen) {
 					i--;
-					pos3 = strsep(&pos2, " ");
-					if (pos3 == NULL) {
-						dbg("requested part of result string not found");
+					if (i == 0)
 						break;
-					}
 				}
-				if (pos3) {
-					strnfieldcat(string, pos3, maxsize);
-					dbg("substitute part of result string '%s'", pos3);
+				if (i > 0) {
+					dbg("requested part of result string not found");
+					break;
 				}
+				strnfieldcpy(temp2, spos, slen+1);
+				strnfieldcat(string, temp2, maxsize);
+				dbg("substitute part of result string '%s'", temp2);
 			} else {
 				strnfieldcat(string, udev->program_result, maxsize);
 				dbg("substitute result string '%s'", udev->program_result);
@@ -527,6 +525,8 @@ attr_found:
 static int compare_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, struct sysfs_pair *pair)
 {
 	struct sysfs_attribute *tmpattr;
+	int i;
+	int len;
 
 	if ((pair == NULL) || (pair->file[0] == '\0') || (pair->value == '\0'))
 		return -ENODEV;
@@ -535,6 +535,18 @@ static int compare_sysfs_attribute(struct sysfs_class_device *class_dev, struct
 	if (tmpattr == NULL)
 		return -ENODEV;
 
+	/* strip trailing whitespace of value, if not asked to match for it */
+	if (! isspace(pair->value[strlen(pair->value)-1])) {
+		i = len = strlen(tmpattr->value);
+		while (i > 0 &&  isspace(tmpattr->value[i-1]))
+			i--;
+		if (i < len) {
+			tmpattr->value[i] = '\0';
+			dbg("remove %i trailing whitespace chars from '%s'",
+			    len - i, tmpattr->value);
+		}
+	}
+
 	dbg("compare attribute '%s' value '%s' with '%s'",
 		  pair->file, tmpattr->value, pair->value);
 	if (strcmp_pattern(pair->value, tmpattr->value) != 0)