[PATCH] klibc: use klcc wrapper instead of our own Makefile

[elogind.git] / udev_rules_parse.c

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index c4c684d05927a8d4aa9e880a968bdb57f12705ca..55412dba3c5a8e7e717236ffff1f0b8e321b300f 100644 (file)
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -168,7 +168,7 @@ static char *get_key_attribute(char *str)
        return NULL;
 }
 
-static int rules_parse(struct udevice *udev, const char *filename)
+static int rules_parse(const char *filename)
 {
        char line[LINE_SIZE];
        char *bufline;
@@ -278,16 +278,36 @@ static int rules_parse(struct udevice *udev, const char *filename)
                                        goto error;
                                }
                                pair = &rule.sysfs_pair[rule.sysfs_pair_count];
-                               rule.sysfs_pair_count++;
-
                                attr = get_key_attribute(key + sizeof(KEY_SYSFS)-1);
                                if (attr == NULL) {
                                        dbg("error parsing " KEY_SYSFS " attribute");
+                                       goto error;
+                               }
+                               strlcpy(pair->name, attr, sizeof(pair->name));
+                               strlcpy(pair->value, value, sizeof(pair->value));
+                               pair->operation = operation;
+                               rule.sysfs_pair_count++;
+                               valid = 1;
+                               continue;
+                       }
+
+                       if (strncasecmp(key, KEY_ENV, sizeof(KEY_ENV)-1) == 0) {
+                               struct key_pair *pair;
+
+                               if (rule.env_pair_count >= KEY_ENV_PAIRS_MAX) {
+                                       dbg("skip rule, to many " KEY_ENV " keys in a single rule");
+                                       goto error;
+                               }
+                               pair = &rule.env_pair[rule.env_pair_count];
+                               attr = get_key_attribute(key + sizeof(KEY_ENV)-1);
+                               if (attr == NULL) {
+                                       dbg("error parsing " KEY_ENV " attribute");
                                        continue;
                                }
                                strlcpy(pair->name, attr, sizeof(pair->name));
                                strlcpy(pair->value, value, sizeof(pair->value));
                                pair->operation = operation;
+                               rule.env_pair_count++;
                                valid = 1;
                                continue;
                        }
@@ -426,9 +446,18 @@ int udev_rules_init(void)
                return -1;
 
        if ((stats.st_mode & S_IFMT) != S_IFDIR)
-               retval = rules_parse(NULL, udev_rules_filename);
-       else
-               retval = call_foreach_file(rules_parse, NULL, udev_rules_filename, RULEFILE_SUFFIX);
+               retval = rules_parse(udev_rules_filename);
+       else {
+               struct name_entry *name_loop, *name_tmp;
+               LIST_HEAD(name_list);
+
+               retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX);
+
+               list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
+                       rules_parse(name_loop->name);
+                       list_del(&name_loop->node);
+               }
+       }
 
        return retval;
 }