chiark / gitweb /
selinux: fix missing includes
[elogind.git] / udev_rules_parse.c
index 7d1853acbe96ecaf3ef3a639c390e96c19354f22..ce659d73ce8eb815d2cd3b0baad4ec7df5e47e81 100644 (file)
@@ -1,8 +1,6 @@
 /*
- * udev_rules_parse.c
- *
  * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -15,7 +13,7 @@
  * 
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "logging.h"
 #include "udev_rules.h"
+#include "udev_selinux.h"
 
 
 void udev_rules_iter_init(struct udev_rules *rules)
@@ -109,12 +105,9 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
                        break;
                if (linepos[0] == '=')
                        break;
-               if (linepos[0] == '+')
-                       break;
-               if (linepos[0] == '!')
-                       break;
-               if (linepos[0] == ':')
-                       break;
+               if ((linepos[0] == '+') || (linepos[0] == '!') || (linepos[0] == ':'))
+                       if (linepos[1] == '=')
+                               break;
        }
 
        /* remember end of key */
@@ -222,7 +215,7 @@ static int add_rule_key_pair(struct udev_rule *rule, struct key_pairs *pairs,
        size_t key_len = strnlen(key, PATH_SIZE);
 
        if (pairs->count >= PAIRS_MAX) {
-               err("skip, too many keys in a single rule");
+               err("skip, too many keys of the same type in a single rule");
                return -1;
        }
 
@@ -238,25 +231,24 @@ static int add_rule_key_pair(struct udev_rule *rule, struct key_pairs *pairs,
        return 0;
 }
 
-static int add_to_rules(struct udev_rules *rules, char *line)
+static int add_to_rules(struct udev_rules *rules, char *line, const char *filename, unsigned int lineno)
 {
+       char buf[sizeof(struct udev_rule) + LINE_SIZE];
        struct udev_rule *rule;
        size_t rule_size;
        int valid;
        char *linepos;
        char *attr;
        size_t padding;
+       int physdev = 0;
        int retval;
 
-       /* get all the keys */
-       rule = calloc(1, sizeof (struct udev_rule) + LINE_SIZE);
-       if (!rule) {
-               err("malloc failed");
-               return -1;
-       }
+       memset(buf, 0x00, sizeof(buf));
+       rule = (struct udev_rule *) buf;
        linepos = line;
        valid = 0;
 
+       /* get all the keys */
        while (1) {
                char *key;
                char *value;
@@ -266,111 +258,205 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                if (retval)
                        break;
 
-               if (strcasecmp(key, "LABEL") == 0) {
-                       add_rule_key(rule, &rule->label, operation, value);
+               if (strcasecmp(key, "ACTION") == 0) {
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid ACTION operation");
+                               goto invalid;
+                       }
+                       add_rule_key(rule, &rule->action, operation, value);
                        valid = 1;
                        continue;
                }
 
-               if (strcasecmp(key, "GOTO") == 0) {
-                       add_rule_key(rule, &rule->goto_label, operation, value);
+               if (strcasecmp(key, "DEVPATH") == 0) {
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid DEVPATH operation");
+                               goto invalid;
+                       }
+                       add_rule_key(rule, &rule->devpath, operation, value);
                        valid = 1;
                        continue;
                }
 
                if (strcasecmp(key, "KERNEL") == 0) {
-                       add_rule_key(rule, &rule->kernel_name, operation, value);
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid KERNEL operation");
+                               goto invalid;
+                       }
+                       add_rule_key(rule, &rule->kernel, operation, value);
                        valid = 1;
                        continue;
                }
 
                if (strcasecmp(key, "SUBSYSTEM") == 0) {
-                       add_rule_key(rule, &rule->subsystem, operation, value);
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid SUBSYSTEM operation");
+                               goto invalid;
+                       }
+                       /* bus, class, subsystem events should all be the same */
+                       if (strcmp(value, "subsystem") == 0 ||
+                           strcmp(value, "bus") == 0 ||
+                           strcmp(value, "class") == 0) {
+                               if (strcmp(value, "bus") == 0 || strcmp(value, "class") == 0)
+                                       err("'%s' must be specified as 'subsystem' "
+                                           "please fix it in %s:%u", value, filename, lineno);
+                               add_rule_key(rule, &rule->subsystem, operation, "subsystem|class|bus");
+                       } else
+                               add_rule_key(rule, &rule->subsystem, operation, value);
                        valid = 1;
                        continue;
                }
 
-               if (strcasecmp(key, "ACTION") == 0) {
-                       add_rule_key(rule, &rule->action, operation, value);
+               if (strcasecmp(key, "DRIVER") == 0) {
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid DRIVER operation");
+                               goto invalid;
+                       }
+                       add_rule_key(rule, &rule->driver, operation, value);
                        valid = 1;
                        continue;
                }
 
-               if (strcasecmp(key, "DEVPATH") == 0) {
-                       add_rule_key(rule, &rule->devpath, operation, value);
+               if (strncasecmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
+                       attr = get_key_attribute(key + sizeof("ATTR")-1);
+                       if (attr == NULL) {
+                               err("error parsing ATTR attribute");
+                               goto invalid;
+                       }
+                       if (add_rule_key_pair(rule, &rule->attr, operation, attr, value) != 0)
+                               goto invalid;
                        valid = 1;
                        continue;
                }
 
-               if (strcasecmp(key, "BUS") == 0) {
-                       add_rule_key(rule, &rule->bus, operation, value);
+               if (strcasecmp(key, "KERNELS") == 0 ||
+                   strcasecmp(key, "ID") == 0) {
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid KERNELS operation");
+                               goto invalid;
+                       }
+                       add_rule_key(rule, &rule->kernels, operation, value);
                        valid = 1;
                        continue;
                }
 
-               if (strcasecmp(key, "ID") == 0) {
-                       add_rule_key(rule, &rule->id, operation, value);
+               if (strcasecmp(key, "SUBSYSTEMS") == 0 ||
+                   strcasecmp(key, "BUS") == 0) {
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid SUBSYSTEMS operation");
+                               goto invalid;
+                       }
+                       add_rule_key(rule, &rule->subsystems, operation, value);
                        valid = 1;
                        continue;
                }
 
-               if (strncasecmp(key, "SYSFS", sizeof("SYSFS")-1) == 0) {
-                       attr = get_key_attribute(key + sizeof("SYSFS")-1);
-                       if (attr == NULL) {
-                               err("error parsing SYSFS attribute in '%s'", line);
-                               continue;
+               if (strcasecmp(key, "DRIVERS") == 0) {
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid DRIVERS operation");
+                               goto invalid;
                        }
-                       add_rule_key_pair(rule, &rule->sysfs, operation, attr, value);
+                       add_rule_key(rule, &rule->drivers, operation, value);
                        valid = 1;
                        continue;
                }
 
-               if (strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
-                       add_rule_key(rule, &rule->wait_for_sysfs, operation, value);
+               if (strncasecmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 ||
+                   strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid ATTRS operation");
+                               goto invalid;
+                       }
+                       attr = get_key_attribute(key + sizeof("ATTRS")-1);
+                       if (attr == NULL) {
+                               err("error parsing ATTRS attribute");
+                               goto invalid;
+                       }
+                       if (strncmp(attr, "device/", 7) == 0)
+                               err("the 'device' link is deprecated and will be removed from a future kernel, "
+                                   "please fix it in %s:%u", filename, lineno);
+                       else if (strstr(attr, "../") != NULL)
+                               err("do not reference parent sysfs directories directly, that may break with a future kernel, "
+                                   "please fix it in %s:%u", filename, lineno);
+                       if (add_rule_key_pair(rule, &rule->attrs, operation, attr, value) != 0)
+                               goto invalid;
                        valid = 1;
                        continue;
                }
 
-               if (strncasecmp(key, "ENV", sizeof("ENV")-1) == 0) {
+               if (strncasecmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
                        attr = get_key_attribute(key + sizeof("ENV")-1);
                        if (attr == NULL) {
                                err("error parsing ENV attribute");
-                               continue;
+                               goto invalid;
                        }
-                       add_rule_key_pair(rule, &rule->env, operation, attr, value);
+                       if (strncmp(attr, "PHYSDEV", 7) == 0)
+                               physdev = 1;
+                       if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
+                               goto invalid;
                        valid = 1;
                        continue;
                }
 
-               if (strcasecmp(key, "MODALIAS") == 0) {
-                       add_rule_key(rule, &rule->modalias, operation, value);
+               if (strcasecmp(key, "PROGRAM") == 0) {
+                       add_rule_key(rule, &rule->program, operation, value);
+                       valid = 1;
+                       continue;
+               }
+
+               if (strcasecmp(key, "RESULT") == 0) {
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid RESULT operation");
+                               goto invalid;
+                       }
+                       add_rule_key(rule, &rule->result, operation, value);
                        valid = 1;
                        continue;
                }
 
                if (strncasecmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
                        attr = get_key_attribute(key + sizeof("IMPORT")-1);
-                       if (attr && strstr(attr, "program")) {
+                       if (attr != NULL && strstr(attr, "program")) {
                                dbg("IMPORT will be executed");
                                rule->import_type  = IMPORT_PROGRAM;
-                       } else if (attr && strstr(attr, "file")) {
+                       } else if (attr != NULL && strstr(attr, "file")) {
                                dbg("IMPORT will be included as file");
                                rule->import_type  = IMPORT_FILE;
-                       } else if (attr && strstr(attr, "parent")) {
+                       } else if (attr != NULL && strstr(attr, "parent")) {
                                dbg("IMPORT will include the parent values");
                                rule->import_type = IMPORT_PARENT;
                        } else {
                                /* figure it out if it is executable */
                                char file[PATH_SIZE];
                                char *pos;
-                               struct stat stats;
+                               struct stat statbuf;
 
                                strlcpy(file, value, sizeof(file));
                                pos = strchr(file, ' ');
                                if (pos)
                                        pos[0] = '\0';
+
+                               /* allow programs in /lib/udev called without the path */
+                               if (strchr(file, '/') == NULL) {
+                                       strlcpy(file, "/lib/udev/", sizeof(file));
+                                       strlcat(file, value, sizeof(file));
+                                       pos = strchr(file, ' ');
+                                       if (pos)
+                                               pos[0] = '\0';
+                               }
+
                                dbg("IMPORT auto mode for '%s'", file);
-                               if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
+                               if (!lstat(file, &statbuf) && (statbuf.st_mode & S_IXUSR)) {
                                        dbg("IMPORT is executable, will be executed (autotype)");
                                        rule->import_type  = IMPORT_PROGRAM;
                                } else {
@@ -383,20 +469,45 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                        continue;
                }
 
-               if (strcasecmp(key, "DRIVER") == 0) {
-                       add_rule_key(rule, &rule->driver, operation, value);
+               if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid TEST operation");
+                               goto invalid;
+                       }
+                       attr = get_key_attribute(key + sizeof("TEST")-1);
+                       if (attr != NULL)
+                               rule->test_mode_mask = strtol(attr, NULL, 8);
+                       add_rule_key(rule, &rule->test, operation, value);
                        valid = 1;
                        continue;
                }
 
-               if (strcasecmp(key, "RESULT") == 0) {
-                       add_rule_key(rule, &rule->result, operation, value);
+               if (strncasecmp(key, "RUN", sizeof("RUN")-1) == 0) {
+                       attr = get_key_attribute(key + sizeof("RUN")-1);
+                       if (attr != NULL) {
+                               if (strstr(attr, "ignore_error"))
+                                       rule->run_ignore_error = 1;
+                       }
+                       add_rule_key(rule, &rule->run, operation, value);
                        valid = 1;
                        continue;
                }
 
-               if (strcasecmp(key, "PROGRAM") == 0) {
-                       add_rule_key(rule, &rule->program, operation, value);
+               if (strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
+                       add_rule_key(rule, &rule->wait_for_sysfs, operation, value);
+                       valid = 1;
+                       continue;
+               }
+
+               if (strcasecmp(key, "LABEL") == 0) {
+                       add_rule_key(rule, &rule->label, operation, value);
+                       valid = 1;
+                       continue;
+               }
+
+               if (strcasecmp(key, "GOTO") == 0) {
+                       add_rule_key(rule, &rule->goto_label, operation, value);
                        valid = 1;
                        continue;
                }
@@ -413,17 +524,18 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                                        rule->ignore_remove = 1;
                                }
                        }
-                       if (value[0] == '\0') {
-                               dbg("name empty device should be ignored");
-                               rule->name.operation = operation;
-                               rule->ignore_device = 1;
-                       } else
-                               add_rule_key(rule, &rule->name, operation, value);
+                       if (value[0] == '\0')
+                               dbg("name empty, node creation supressed");
+                       add_rule_key(rule, &rule->name, operation, value);
                        continue;
                }
 
                if (strcasecmp(key, "SYMLINK") == 0) {
-                       add_rule_key(rule, &rule->symlink, operation, value);
+                       if (operation == KEY_OP_MATCH ||
+                           operation == KEY_OP_NOMATCH)
+                               add_rule_key(rule, &rule->symlink_match, operation, value);
+                       else
+                               add_rule_key(rule, &rule->symlink, operation, value);
                        valid = 1;
                        continue;
                }
@@ -473,13 +585,9 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                        continue;
                }
 
-               if (strcasecmp(key, "RUN") == 0) {
-                       add_rule_key(rule, &rule->run, operation, value);
-                       valid = 1;
-                       continue;
-               }
-
                if (strcasecmp(key, "OPTIONS") == 0) {
+                       const char *pos;
+
                        if (strstr(value, "last_rule") != NULL) {
                                dbg("last rule to be applied");
                                rule->last_rule = 1;
@@ -492,6 +600,19 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                                dbg("remove event should be ignored");
                                rule->ignore_remove = 1;
                        }
+                       pos = strstr(value, "link_priority=");
+                       if (pos != NULL) {
+                               rule->link_priority = atoi(&pos[strlen("link_priority=")]);
+                               dbg("link priority=%i", rule->link_priority);
+                       }
+                       pos = strstr(value, "string_escape=");
+                       if (pos != NULL) {
+                               pos = &pos[strlen("string_escape=")];
+                               if (strncmp(pos, "none", strlen("none")) == 0)
+                                       rule->string_escape = ESCAPE_NONE;
+                               else if (strncmp(pos, "replace", strlen("replace")) == 0)
+                                       rule->string_escape = ESCAPE_REPLACE;
+                       }
                        if (strstr(value, "all_partitions") != NULL) {
                                dbg("creation of partition nodes requested");
                                rule->partitions = DEFAULT_PARTITIONS_COUNT;
@@ -500,14 +621,16 @@ static int add_to_rules(struct udev_rules *rules, char *line)
                        continue;
                }
 
-               err("unknown key '%s', in '%s'", key, line);
+               err("unknown key '%s' in %s:%u", key, filename, lineno);
        }
 
+       if (physdev && rule->wait_for_sysfs.operation == KEY_OP_UNSET)
+               err("PHYSDEV* values are deprecated and will be removed from a future kernel, "
+                   "please fix it in %s:%u", filename, lineno);
+
        /* skip line if not any valid key was found */
-       if (!valid) {
-               err("invalid rule '%s'", line);
-               goto exit;
-       }
+       if (!valid)
+               goto invalid;
 
        /* grow buffer and add rule */
        rule_size = sizeof(struct udev_rule) + rule->bufsize;
@@ -525,15 +648,18 @@ static int add_to_rules(struct udev_rules *rules, char *line)
        memcpy(rules->buf + rules->bufsize, rule, rule_size);
        rules->bufsize += rule_size;
 exit:
-       free(rule);
        return 0;
+
+invalid:
+       err("invalid rule '%s:%u'", filename, lineno);
+       return -1;
 }
 
 static int parse_file(struct udev_rules *rules, const char *filename)
 {
        char line[LINE_SIZE];
        char *bufline;
-       int lineno;
+       unsigned int lineno;
        char *buf;
        size_t bufsize;
        size_t cur;
@@ -541,10 +667,10 @@ static int parse_file(struct udev_rules *rules, const char *filename)
        int retval = 0;
 
        if (file_map(filename, &buf, &bufsize) != 0) {
-               err("can't open '%s' as rules file", filename);
+               err("can't open '%s' as rules file: %s", filename, strerror(errno));
                return -1;
        }
-       dbg("reading '%s' as rules file", filename);
+       info("reading '%s' as rules file", filename);
 
        /* loop through the whole file */
        cur = 0;
@@ -557,11 +683,6 @@ static int parse_file(struct udev_rules *rules, const char *filename)
                cur += count+1;
                lineno++;
 
-               if (count >= sizeof(line)) {
-                       info("line too long, rule skipped %s, line %d", filename, lineno);
-                       continue;
-               }
-
                /* eat the whitespace */
                while ((count > 0) && isspace(bufline[0])) {
                        bufline++;
@@ -574,7 +695,12 @@ static int parse_file(struct udev_rules *rules, const char *filename)
                if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
-               /* skip backslash and newline from multi line rules */
+               if (count >= sizeof(line)) {
+                       err("line too long, rule skipped '%s:%u'", filename, lineno);
+                       continue;
+               }
+
+               /* skip backslash and newline from multiline rules */
                for (i = j = 0; i < count; i++) {
                        if (bufline[i] == '\\' && bufline[i+1] == '\n')
                                continue;
@@ -584,87 +710,88 @@ static int parse_file(struct udev_rules *rules, const char *filename)
                line[j] = '\0';
 
                dbg("read '%s'", line);
-               add_to_rules(rules, line);
+               add_to_rules(rules, line, filename, lineno);
        }
 
        file_unmap(buf, bufsize);
        return retval;
 }
 
-static int rules_map(struct udev_rules *rules, const char *filename)
-{
-       if (file_map(filename, &rules->buf, &rules->bufsize)) {
-               rules->buf = NULL;
-               return -1;
-       }
-       if (rules->bufsize == 0) {
-               file_unmap(rules->buf, rules->bufsize);
-               rules->buf = NULL;
-               return -1;
-       }
-       rules->mapped = 1;
-
-       return 0;
-}
-
-int udev_rules_init(struct udev_rules *rules, int read_compiled, int resolve_names)
+int udev_rules_init(struct udev_rules *rules, int resolve_names)
 {
-       char comp[PATH_SIZE];
-       struct stat stats;
-       int retval;
+       struct stat statbuf;
+       char filename[PATH_MAX];
+       LIST_HEAD(name_list);
+       LIST_HEAD(dyn_list);
+       struct name_entry *name_loop, *name_tmp;
+       struct name_entry *dyn_loop, *dyn_tmp;
+       int retval = 0;
 
        memset(rules, 0x00, sizeof(struct udev_rules));
        rules->resolve_names = resolve_names;
 
-       /* check for precompiled rules */
-       if (read_compiled) {
-               strlcpy(comp, udev_rules_filename, sizeof(comp));
-               strlcat(comp, ".compiled", sizeof(comp));
-               if (stat(comp, &stats) == 0) {
-                       dbg("map compiled rules '%s'", comp);
-                       if (rules_map(rules, comp) == 0)
-                               return 0;
-               }
+       /* read main config from single file or all files in a directory */
+       if (stat(udev_rules_dir, &statbuf) != 0)
+               return -1;
+       if ((statbuf.st_mode & S_IFMT) != S_IFDIR) {
+               dbg("parse single rules file '%s'", udev_rules_dir);
+               name_list_add(&name_list, udev_rules_dir, 1);
+       } else {
+               dbg("parse rules directory '%s'", udev_rules_dir);
+               retval = add_matching_files(&name_list, udev_rules_dir, RULESFILE_SUFFIX);
        }
 
-       /* parse rules file or all matching files in directory */
-       if (stat(udev_rules_filename, &stats) != 0)
-               return -1;
+       /* read dynamic rules directory */
+       strlcpy(filename, udev_root, sizeof(filename));
+       strlcat(filename, "/"RULES_DYN_DIR, sizeof(filename));
+       if (stat(filename, &statbuf) != 0) {
+               create_path(filename);
+               selinux_setfscreatecon(filename, NULL, S_IFDIR|0755);
+               mkdir(filename, 0755);
+               selinux_resetfscreatecon();
+       }
+       add_matching_files(&dyn_list, filename, RULESFILE_SUFFIX);
 
-       if ((stats.st_mode & S_IFMT) != S_IFDIR) {
-               dbg("parse single rules file '%s'", udev_rules_filename);
-               retval = parse_file(rules, udev_rules_filename);
-       } else {
-               struct name_entry *name_loop, *name_tmp;
-               LIST_HEAD(name_list);
+       /* sort dynamic rules files by basename into list of files */
+       list_for_each_entry_safe(dyn_loop, dyn_tmp, &dyn_list, node) {
+               const char *dyn_base = strrchr(dyn_loop->name, '/');
 
-               dbg("parse rules directory '%s'", udev_rules_filename);
-               retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX);
+               if (dyn_base == NULL)
+                       continue;
 
                list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
-                       if (stat(name_loop->name, &stats) == 0) {
-                               if (stats.st_size)
-                                       parse_file(rules, name_loop->name);
-                               else
-                                       dbg("empty rules file '%s'", name_loop->name);
-                       } else
-                               dbg("could not read '%s'", name_loop->name);
-                       list_del(&name_loop->node);
-                       free(name_loop);
+                       const char *name_base = strrchr(name_loop->name, '/');
+
+                       if (name_base == NULL)
+                               continue;
+
+                       if (strcmp(name_base, dyn_base) > 0)
+                               break;
                }
+               list_move_tail(&dyn_loop->node, &name_loop->node);
+       }
+
+       /* parse list of files */
+       list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
+               if (stat(name_loop->name, &statbuf) == 0) {
+                       if (statbuf.st_size)
+                               parse_file(rules, name_loop->name);
+                       else
+                               dbg("empty rules file '%s'", name_loop->name);
+               } else
+                       err("could not read '%s': %s", name_loop->name, strerror(errno));
+               list_del(&name_loop->node);
+               free(name_loop);
        }
 
        return retval;
 }
 
-void udev_rules_close(struct udev_rules *rules)
+void udev_rules_cleanup(struct udev_rules *rules)
 {
        if (rules->buf) {
-               if (rules->mapped) {
-                       rules->mapped = 0;
-                       file_unmap(rules->buf, rules->bufsize);
-               } else
-                       free(rules->buf);
+               free(rules->buf);
                rules->buf = NULL;
        }
 }
+