X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev_parse.c;h=ed38db4b142267e6f617cff36af0482c4306058a;hb=c98cb35eb5f24940cf8836be96de42c9e8795f27;hp=981daa7b3b1d3e5e6a173c2e75e8b3d308d37ee3;hpb=fd9efc00a2e477423185c993b8ec4570ef3ee07d;p=elogind.git

diff --git a/namedev_parse.c b/namedev_parse.c
index 981daa7b3..ed38db4b1 100644
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -153,7 +153,7 @@ static int namedev_parse(const char *filename, void *data)
 
 		/* skip backslash and newline from multi line rules */
 		for (i = j = 0; i < count; i++) {
-			if (bufline[i] == '\\' || bufline[i] == '\n')
+			if (bufline[i] == '\\' && bufline[i+1] == '\n')
 				continue;
 
 			line[j++] = bufline[i];
@@ -171,6 +171,18 @@ static int namedev_parse(const char *filename, void *data)
 			if (retval)
 				break;
 
+			if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
+				strfieldcpy(dev.kernel, temp3);
+				valid = 1;
+				continue;
+			}
+
+			if (strcasecmp(temp2, FIELD_SUBSYSTEM) == 0) {
+				strfieldcpy(dev.subsystem, temp3);
+				valid = 1;
+				continue;
+			}
+
 			if (strcasecmp(temp2, FIELD_BUS) == 0) {
 				strfieldcpy(dev.bus, temp3);
 				valid = 1;
@@ -215,18 +227,6 @@ static int namedev_parse(const char *filename, void *data)
 				continue;
 			}
 
-			if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
-				strfieldcpy(dev.kernel, temp3);
-				valid = 1;
-				continue;
-			}
-
-			if (strcasecmp(temp2, FIELD_SUBSYSTEM) == 0) {
-				strfieldcpy(dev.subsystem, temp3);
-				valid = 1;
-				continue;
-			}
-
 			if (strcasecmp(temp2, FIELD_DRIVER) == 0) {
 				strfieldcpy(dev.driver, temp3);
 				valid = 1;
@@ -250,16 +250,19 @@ static int namedev_parse(const char *filename, void *data)
 				attr = get_key_attribute(temp2 + sizeof(FIELD_NAME)-1);
 				/* FIXME: remove old style options and make OPTIONS= mandatory */
 				if (attr != NULL) {
-					if (strstr(attr, ATTR_PARTITIONS) != NULL) {
+					if (strstr(attr, OPTION_PARTITIONS) != NULL) {
 						dbg_parse("creation of partition nodes requested");
 						dev.partitions = DEFAULT_PARTITIONS_COUNT;
 					}
-					if (strstr(attr, ATTR_IGNORE_REMOVE) != NULL) {
+					if (strstr(attr, OPTION_IGNORE_REMOVE) != NULL) {
 						dbg_parse("remove event should be ignored");
 						dev.ignore_remove = 1;
 					}
 				}
-				strfieldcpy(dev.name, temp3);
+				if (temp3[0] != '\0')
+					strfieldcpy(dev.name, temp3);
+				else
+					dev.ignore_device = 1;
 				valid = 1;
 				continue;
 			}
@@ -289,15 +292,15 @@ static int namedev_parse(const char *filename, void *data)
 			}
 
 			if (strcasecmp(temp2, FIELD_OPTIONS) == 0) {
-				if (strstr(temp3, ATTR_IGNORE_DEVICE) != NULL) {
+				if (strstr(temp3, OPTION_IGNORE_DEVICE) != NULL) {
 					dbg_parse("device should be ignored");
 					dev.ignore_device = 1;
 				}
-				if (strstr(temp3, ATTR_IGNORE_REMOVE) != NULL) {
+				if (strstr(temp3, OPTION_IGNORE_REMOVE) != NULL) {
 					dbg_parse("remove event should be ignored");
 					dev.ignore_remove = 1;
 				}
-				if (strstr(temp3, ATTR_PARTITIONS) != NULL) {
+				if (strstr(temp3, OPTION_PARTITIONS) != NULL) {
 					dbg_parse("creation of partition nodes requested");
 					dev.partitions = DEFAULT_PARTITIONS_COUNT;
 				}