#include <sys/stat.h>
#include <errno.h>
-#include "udev_libc_wrapper.h"
#include "udev.h"
-#include "udev_utils.h"
-#include "logging.h"
#include "udev_rules.h"
pos = strchr(file, ' ');
if (pos)
pos[0] = '\0';
+
+ /* allow programs in /lib/udev called without the path */
+ if (strchr(file, '/') == NULL) {
+ strlcpy(file, "/lib/udev/", sizeof(file));
+ strlcat(file, value, sizeof(file));
+ pos = strchr(file, ' ');
+ if (pos)
+ pos[0] = '\0';
+ }
+
dbg("IMPORT auto mode for '%s'", file);
if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
dbg("IMPORT is executable, will be executed (autotype)");
rule->ignore_remove = 1;
}
}
- if (value[0] == '\0') {
- dbg("name empty device should be ignored");
- rule->name.operation = operation;
- rule->ignore_device = 1;
- } else
- add_rule_key(rule, &rule->name, operation, value);
+ if (value[0] == '\0')
+ dbg("name empty, node creation supressed");
+ add_rule_key(rule, &rule->name, operation, value);
continue;
}
int retval = 0;
if (file_map(filename, &buf, &bufsize) != 0) {
- err("can't open '%s' as rules file", filename);
+ err("can't open '%s' as rules file: %s", filename, strerror(errno));
return -1;
}
dbg("reading '%s' as rules file", filename);
else
dbg("empty rules file '%s'", name_loop->name);
} else
- dbg("could not read '%s'", name_loop->name);
+ err("could not read '%s': %s", name_loop->name, strerror(errno));
list_del(&name_loop->node);
free(name_loop);
}
return retval;
}
-void udev_rules_close(struct udev_rules *rules)
+void udev_rules_cleanup(struct udev_rules *rules)
{
if (rules->buf) {
free(rules->buf);