[PATCH] add ENV{} key to match agains environment variables

[elogind.git] / udev_rules_parse.c

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index ac4755fd37d578a9cf6002b1568f96809b3f7e53..face496ab33b68880635fa099d417035e053a5a4 100644 (file)
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -39,38 +39,27 @@
 
 LIST_HEAD(udev_rule_list);
 
-static int add_config_dev(struct udev_rule *new_rule)
+static int add_config_dev(struct udev_rule *rule)
 {
        struct udev_rule *tmp_rule;
 
        tmp_rule = malloc(sizeof(*tmp_rule));
        if (tmp_rule == NULL)
                return -ENOMEM;
-       memcpy(tmp_rule, new_rule, sizeof(*tmp_rule));
+       memcpy(tmp_rule, rule, sizeof(struct udev_rule));
        list_add_tail(&tmp_rule->node, &udev_rule_list);
-       udev_rule_dump(tmp_rule);
 
-       return 0;
-}
-
-void udev_rule_dump(struct udev_rule *rule)
-{
        dbg("name='%s', symlink='%s', bus='%s', id='%s', "
            "sysfs_file[0]='%s', sysfs_value[0]='%s', "
-           "kernel='%s', program='%s', result='%s'"
-           "owner='%s', group='%s', mode=%#o",
+           "kernel='%s', program='%s', result='%s', "
+           "owner='%s', group='%s', mode=%#o, "
+           "all_partions=%u, ignore_remove=%u, ignore_device=%u, last_rule=%u",
            rule->name, rule->symlink, rule->bus, rule->id,
-           rule->sysfs_pair[0].file, rule->sysfs_pair[0].value,
-           rule->kernel, rule->program, rule->result,
-           rule->owner, rule->group, rule->mode);
-}
+           rule->sysfs_pair[0].name, rule->sysfs_pair[0].value,
+           rule->kernel, rule->program, rule->result, rule->owner, rule->group, rule->mode,
+           rule->partitions, rule->ignore_remove, rule->ignore_device, rule->last_rule);
 
-void udev_rule_list_dump(void)
-{
-       struct udev_rule *rule;
-
-       list_for_each_entry(rule, &udev_rule_list, node)
-               udev_rule_dump(rule);
+       return 0;
 }
 
 static int get_key(char **line, char **key, enum key_operation *operation, char **value)
@@ -282,29 +271,44 @@ static int rules_parse(struct udevice *udev, const char *filename)
                        }
 
                        if (strncasecmp(key, KEY_SYSFS, sizeof(KEY_SYSFS)-1) == 0) {
-                               struct sysfs_pair *pair = &rule.sysfs_pair[0];
-                               int sysfs_pair_num = 0;
-
-                               /* find first unused pair */
-                               while (pair->file[0] != '\0') {
-                                       ++sysfs_pair_num;
-                                       if (sysfs_pair_num >= MAX_SYSFS_PAIRS) {
-                                               pair = NULL;
-                                               break;
-                                       }
-                                       ++pair;
+                               struct key_pair *pair;
+
+                               if (rule.sysfs_pair_count >= KEY_SYSFS_PAIRS_MAX) {
+                                       dbg("skip rule, to many " KEY_SYSFS " keys in a single rule");
+                                       goto error;
                                }
-                               if (pair) {
-                                       attr = get_key_attribute(key + sizeof(KEY_SYSFS)-1);
-                                       if (attr == NULL) {
-                                               dbg("error parsing " KEY_SYSFS " attribute");
-                                               continue;
-                                       }
-                                       strlcpy(pair->file, attr, sizeof(pair->file));
-                                       strlcpy(pair->value, value, sizeof(pair->value));
-                                       pair->operation = operation;
-                                       valid = 1;
+                               pair = &rule.sysfs_pair[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;
                        }
 
@@ -405,7 +409,7 @@ static int rules_parse(struct udevice *udev, const char *filename)
                        goto error;
 
                /* simple plausibility checks for given keys */
-               if ((rule.sysfs_pair[0].file[0] == '\0') ^
+               if ((rule.sysfs_pair[0].name[0] == '\0') ^
                    (rule.sysfs_pair[0].value[0] == '\0')) {
                        info("inconsistency in " KEY_SYSFS " key");
                        goto error;