fix udevinfo output

[elogind.git] / udev_rules_parse.c

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 4580a779c6be8b77b3c5ccf8805765be20890a1c..488b7a7ff0c31b258fcb749eb9e744d90afda39d 100644 (file)
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -607,7 +607,7 @@ static int rules_map(struct udev_rules *rules, const char *filename)
        return 0;
 }
 
-int udev_rules_init(struct udev_rules *rules, int resolve_names)
+int udev_rules_init(struct udev_rules *rules, int read_compiled, int resolve_names)
 {
        char comp[PATH_SIZE];
        struct stat stats;
@@ -617,14 +617,17 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
        rules->resolve_names = resolve_names;
 
        /* check for precompiled rules */
-       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;
+       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;
+               }
        }
 
+       /* parse rules file or all matching files in directory */
        if (stat(udev_rules_filename, &stats) != 0)
                return -1;
 
@@ -650,10 +653,12 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
 
 void udev_rules_close(struct udev_rules *rules)
 {
-       if (rules->mapped)
-               file_unmap(rules->buf, rules->bufsize);
-       else
-               free(rules->buf);
-
-       rules->buf = NULL;
+       if (rules->buf) {
+               if (rules->mapped) {
+                       rules->mapped = 0;
+                       file_unmap(rules->buf, rules->bufsize);
+               } else
+                       free(rules->buf);
+               rules->buf = NULL;
+       }
 }