diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2007-07-14 20:44:19 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2007-07-14 20:44:19 +0200 |
| commit | 274da2b23d37f2dd174f765e9cfcc485e4a5a898 (patch) | |
| tree | 93a296ef8b7674e9265f1dbd11e5da9b8cc915eb /udev_rules_parse.c | |
| parent | fb819f5554530dd136d50aa40438e9dbeeceac01 (diff) | |
add udev_rules_run() to handle RUN list
Diffstat (limited to 'udev_rules_parse.c')
| -rw-r--r-- | udev_rules_parse.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/udev_rules_parse.c b/udev_rules_parse.c index c4fa142b04..638ea159fb 100644 --- a/udev_rules_parse.c +++ b/udev_rules_parse.c @@ -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; |