X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev_parse.c;h=981daa7b3b1d3e5e6a173c2e75e8b3d308d37ee3;hp=3b14a6a50051a10e774b47f0dbbb5c0d8c311022;hb=311a2b0a1d65a1bd02bbedda0dda90f10d6b6788;hpb=9f8dfa19cfd2b502bf794f39a421cbb7c4cc0404

diff --git a/namedev_parse.c b/namedev_parse.c
index 3b14a6a50..981daa7b3 100644
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -4,6 +4,7 @@
  * Userspace devfs
  *
  * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *
  *	This program is free software; you can redistribute it and/or modify it
@@ -126,7 +127,7 @@ static int namedev_parse(const char *filename, void *data)
 	cur = 0;
 	lineno = 0;
 	while (cur < bufsize) {
-		int i, j;
+		unsigned int i, j;
 
 		count = buf_get_line(buf, bufsize, cur);
 		bufline = &buf[cur];
@@ -247,10 +248,11 @@ static int namedev_parse(const char *filename, void *data)
 
 			if (strncasecmp(temp2, FIELD_NAME, sizeof(FIELD_NAME)-1) == 0) {
 				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) {
 						dbg_parse("creation of partition nodes requested");
-						dev.partitions = PARTITIONS_COUNT;
+						dev.partitions = DEFAULT_PARTITIONS_COUNT;
 					}
 					if (strstr(attr, ATTR_IGNORE_REMOVE) != NULL) {
 						dbg_parse("remove event should be ignored");
@@ -286,6 +288,23 @@ static int namedev_parse(const char *filename, void *data)
 				continue;
 			}
 
+			if (strcasecmp(temp2, FIELD_OPTIONS) == 0) {
+				if (strstr(temp3, ATTR_IGNORE_DEVICE) != NULL) {
+					dbg_parse("device should be ignored");
+					dev.ignore_device = 1;
+				}
+				if (strstr(temp3, ATTR_IGNORE_REMOVE) != NULL) {
+					dbg_parse("remove event should be ignored");
+					dev.ignore_remove = 1;
+				}
+				if (strstr(temp3, ATTR_PARTITIONS) != NULL) {
+					dbg_parse("creation of partition nodes requested");
+					dev.partitions = DEFAULT_PARTITIONS_COUNT;
+				}
+				valid = 1;
+				continue;
+			}
+
 			dbg("unknown type of field '%s'", temp2);
 			goto error;
 		}
@@ -338,3 +357,14 @@ int namedev_init(void)
 
 	return retval;
 }
+
+void namedev_close(void)
+{
+	struct config_device *dev;
+
+	list_for_each_entry(dev, &config_device_list, node) {
+		list_del(&dev->node);
+		free(dev);
+	}
+}
+