remember mapped rules state

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

diff --git a/udev_rules.c b/udev_rules.c
index a25c2e90a8bc196b6f3a44a219b339a01505c74b..77b97d7f99de9469bc03bbacaa2f625ad28d9147 100644 (file)
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -606,8 +606,8 @@ found:
                        pos = getenv(attr);
                        if (pos == NULL)
                                break;
-                       strlcat(string, pos, maxsize);
                        dbg("substitute env '%s=%s'", attr, pos);
+                       strlcat(string, pos, maxsize);
                        break;
                default:
                        err("unknown substitution type=%i", type);

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index a2f2f1804b2279470b5a0e786c3764e1967382d9..9483bcd71f802789cbb4e4bf209c113af3cc01e3 100644 (file)
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -548,6 +548,7 @@ static int rules_map(struct udev_rules *rules, const char *filename)
                rules->buf = NULL;
                return -1;
        }
+       rules->mapped = 1;
 
        return 0;
 }