chiark / gitweb /
add udev_rules_run() to handle RUN list
[elogind.git] / udev_rules_parse.c
index c4fa142..638ea15 100644 (file)
@@ -425,13 +425,13 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 
                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 {
@@ -479,8 +479,10 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 
                if (strncasecmp(key, "RUN", sizeof("RUN")-1) == 0) {
                        attr = get_key_attribute(key + sizeof("RUN")-1);
-                       if (attr && strstr(attr, "ignore_error"))
-                               rule->run_ignore_error = 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;