char owner[32];
uid_t uid = lookup_user(value);
dbg("replacing username='%s' by id=%i", value, uid);
- sprintf(owner, "%li", uid);
+ sprintf(owner, "%u", (unsigned int) uid);
add_rule_key(rule, &rule->owner, operation, owner);
continue;
}
char group[32];
gid_t gid = lookup_group(value);
dbg("replacing groupname='%s' by id=%i", value, gid);
- sprintf(group, "%li", gid);
+ sprintf(group, "%u", (unsigned int) gid);
add_rule_key(rule, &rule->group, operation, group);
continue;
}
return 0;
}
-int udev_rules_init(struct udev_rules *rules, int resolve_names)
+int udev_rules_init(struct udev_rules *rules, int read_compiled, int resolve_names)
{
char comp[PATH_SIZE];
struct stat stats;
rules->resolve_names = resolve_names;
/* check for precompiled rules */
- strlcpy(comp, udev_rules_filename, sizeof(comp));
- strlcat(comp, ".compiled", sizeof(comp));
- if (stat(comp, &stats) == 0) {
- dbg("map compiled rules '%s'", comp);
- if (rules_map(rules, comp) == 0)
- return 0;
+ if (read_compiled) {
+ strlcpy(comp, udev_rules_filename, sizeof(comp));
+ strlcat(comp, ".compiled", sizeof(comp));
+ if (stat(comp, &stats) == 0) {
+ dbg("map compiled rules '%s'", comp);
+ if (rules_map(rules, comp) == 0)
+ return 0;
+ }
}
+ /* parse rules file or all matching files in directory */
if (stat(udev_rules_filename, &stats) != 0)
return -1;
retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX);
list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
- parse_file(rules, name_loop->name);
+ 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
+ dbg("could not read '%s'", name_loop->name);
list_del(&name_loop->node);
free(name_loop);
}
void udev_rules_close(struct udev_rules *rules)
{
- if (rules->mapped)
- file_unmap(rules->buf, rules->bufsize);
- else
- free(rules->buf);
-
- rules->buf = NULL;
+ if (rules->buf) {
+ if (rules->mapped) {
+ rules->mapped = 0;
+ file_unmap(rules->buf, rules->bufsize);
+ } else
+ free(rules->buf);
+ rules->buf = NULL;
+ }
}