[PATCH] udev_volume_id: version 39

[elogind.git] / namedev_parse.c

diff --git a/namedev_parse.c b/namedev_parse.c
index eabd9c98bb1957f089af68b14e958cf7d22fd009..e360565950c71768975891c8264f76e21031e3b7 100644 (file)
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -98,7 +98,7 @@ static char *get_key_attribute(char *str)
        return NULL;
 }
 
-static int namedev_parse(const char *filename, void *data)
+static int namedev_parse(struct udevice *udev, const char *filename)
 {
        char line[LINE_SIZE];
        char *bufline;
@@ -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];
@@ -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;
                                }
@@ -351,9 +354,9 @@ int namedev_init(void)
                return -1;
 
        if ((stats.st_mode & S_IFMT) != S_IFDIR)
-               retval = namedev_parse(udev_rules_filename, NULL);
+               retval = namedev_parse(NULL, udev_rules_filename);
        else
-               retval = call_foreach_file(namedev_parse, udev_rules_filename, RULEFILE_SUFFIX, NULL);
+               retval = call_foreach_file(namedev_parse, NULL, udev_rules_filename, RULEFILE_SUFFIX);
 
        return retval;
 }
@@ -361,8 +364,9 @@ int namedev_init(void)
 void namedev_close(void)
 {
        struct config_device *dev;
+       struct config_device *temp_dev;
 
-       list_for_each_entry(dev, &config_device_list, node) {
+       list_for_each_entry_safe(dev, temp_dev, &config_device_list, node) {
                list_del(&dev->node);
                free(dev);
        }