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 {
/* figure it out if it is executable */
char file[PATH_SIZE];
char *pos;
- struct stat stats;
+ struct stat statbuf;
strlcpy(file, value, sizeof(file));
pos = strchr(file, ' ');
}
dbg("IMPORT auto mode for '%s'", file);
- if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
+ if (!lstat(file, &statbuf) && (statbuf.st_mode & S_IXUSR)) {
dbg("IMPORT is executable, will be executed (autotype)");
rule->import_type = IMPORT_PROGRAM;
} else {
}
if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+ if (operation != KEY_OP_MATCH &&
+ operation != KEY_OP_NOMATCH) {
+ err("invalid TEST operation");
+ goto invalid;
+ }
attr = get_key_attribute(key + sizeof("TEST")-1);
if (attr != NULL)
rule->test_mode_mask = strtol(attr, NULL, 8);
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;
}
if (strcasecmp(key, "SYMLINK") == 0) {
- add_rule_key(rule, &rule->symlink, operation, value);
+ if (operation == KEY_OP_MATCH ||
+ operation == KEY_OP_NOMATCH)
+ add_rule_key(rule, &rule->symlink_match, operation, value);
+ else
+ add_rule_key(rule, &rule->symlink, operation, value);
valid = 1;
continue;
}
pos = strstr(value, "link_priority=");
if (pos != NULL) {
rule->link_priority = atoi(&pos[strlen("link_priority=")]);
- info("link priority=%i", rule->link_priority);
+ dbg("link priority=%i", rule->link_priority);
}
pos = strstr(value, "string_escape=");
if (pos != NULL) {
int udev_rules_init(struct udev_rules *rules, int resolve_names)
{
- struct stat stats;
- int retval;
+ struct stat statbuf;
+ char filename[PATH_MAX];
+ LIST_HEAD(name_list);
+ LIST_HEAD(dyn_list);
+ struct name_entry *name_loop, *name_tmp;
+ struct name_entry *dyn_loop, *dyn_tmp;
+ int retval = 0;
memset(rules, 0x00, sizeof(struct udev_rules));
rules->resolve_names = resolve_names;
- /* parse rules file or all matching files in directory */
- if (stat(udev_rules_dir, &stats) != 0)
+ /* read main config from single file or all files in a directory */
+ if (stat(udev_rules_dir, &statbuf) != 0)
return -1;
-
- if ((stats.st_mode & S_IFMT) != S_IFDIR) {
+ if ((statbuf.st_mode & S_IFMT) != S_IFDIR) {
dbg("parse single rules file '%s'", udev_rules_dir);
- retval = parse_file(rules, udev_rules_dir);
+ name_list_add(&name_list, udev_rules_dir, 1);
} else {
- struct name_entry *name_loop, *name_tmp;
- LIST_HEAD(name_list);
-
dbg("parse rules directory '%s'", udev_rules_dir);
retval = add_matching_files(&name_list, udev_rules_dir, RULESFILE_SUFFIX);
+ }
+
+ /* read dynamic rules directory */
+ strlcpy(filename, udev_root, sizeof(filename));
+ strlcat(filename, "/"RULES_DYN_DIR, sizeof(filename));
+ if (stat(filename, &statbuf) != 0) {
+ create_path(filename);
+ selinux_setfscreatecon(filename, NULL, S_IFDIR|0755);
+ mkdir(filename, 0755);
+ selinux_resetfscreatecon();
+ }
+ add_matching_files(&dyn_list, filename, RULESFILE_SUFFIX);
+
+ /* sort dynamic rules files by basename into list of files */
+ list_for_each_entry_safe(dyn_loop, dyn_tmp, &dyn_list, node) {
+ const char *dyn_base = strrchr(dyn_loop->name, '/');
+
+ if (dyn_base == NULL)
+ continue;
list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
- if (stat(name_loop->name, &stats) == 0) {
- if (stats.st_size)
- parse_file(rules, name_loop->name);
- else
- dbg("empty rules file '%s'", name_loop->name);
- } else
- err("could not read '%s': %s", name_loop->name, strerror(errno));
- list_del(&name_loop->node);
- free(name_loop);
+ const char *name_base = strrchr(name_loop->name, '/');
+
+ if (name_base == NULL)
+ continue;
+
+ if (strcmp(name_base, dyn_base) > 0)
+ break;
}
+ list_move_tail(&dyn_loop->node, &name_loop->node);
+ }
+
+ /* parse list of files */
+ list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
+ if (stat(name_loop->name, &statbuf) == 0) {
+ if (statbuf.st_size)
+ parse_file(rules, name_loop->name);
+ else
+ dbg("empty rules file '%s'", name_loop->name);
+ } else
+ err("could not read '%s': %s", name_loop->name, strerror(errno));
+ list_del(&name_loop->node);
+ free(name_loop);
}
return retval;
rules->buf = NULL;
}
}
+
~ianmdlvl / elogind.git / blobdiff