split up long line

[elogind.git] / udev / udev-rules.c

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 7ba52208fb243daafaf971d82befe26cbb15d451..ccf1eaaf8f43b5027038780be1975dce2349148c 100644 (file)
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1454,10 +1454,10 @@ static int add_rule(struct udev_rules *rules, char *line,
                        uid = strtoul(value, &endptr, 10);
                        if (endptr[0] == '\0') {
                                rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
-                       } else if (rules->resolve_names && strchr("$%", value[0]) == NULL) {
+                       } else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) {
                                uid = add_uid(rules, value);
                                rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
-                       } else {
+                       } else if (rules->resolve_names == 0) {
                                rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL);
                        }
                        rule_tmp.rule.rule.flags = 1;
@@ -1472,10 +1472,10 @@ static int add_rule(struct udev_rules *rules, char *line,
                        gid = strtoul(value, &endptr, 10);
                        if (endptr[0] == '\0') {
                                rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
-                       } else if (rules->resolve_names && strchr("$%", value[0]) == NULL) {
+                       } else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) {
                                gid = add_gid(rules, value);
                                rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
-                       } else {
+                       } else if (rules->resolve_names == 0) {
                                rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL);
                        }
                        rule_tmp.rule.rule.flags = 1;
@@ -1649,7 +1649,7 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
        dbg(udev, "open directory '%s'\n", dirname);
        dir = opendir(dirname);
        if (dir == NULL) {
-               err(udev, "unable to open '%s': %m\n", dirname);
+               info(udev, "unable to open '%s': %m\n", dirname);
                return -1;
        }
 
@@ -2504,9 +2504,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                     rule->rule.filename_line);
                                f = fopen(attr, "w");
                                if (f != NULL) {
-                                       if (!event->test)
-                                               if (fprintf(f, "%s", value) <= 0)
-                                                       err(event->udev, "error writing ATTR{%s}: %m\n", attr);
+                                       if (fprintf(f, "%s", value) <= 0)
+                                               err(event->udev, "error writing ATTR{%s}: %m\n", attr);
                                        fclose(f);
                                } else {
                                        err(event->udev, "error opening ATTR{%s} for writing: %m\n", attr);