/* global variables */
char sysfs_path[PATH_SIZE];
char udev_root[PATH_SIZE];
-char udev_db_path[PATH_SIZE];
char udev_config_filename[PATH_SIZE];
char udev_rules_filename[PATH_SIZE];
int udev_log_priority;
int retval = 0;
if (file_map(udev_config_filename, &buf, &bufsize) != 0) {
- err("can't open '%s' as config file", udev_config_filename);
+ err("can't open '%s' as config file: %s", udev_config_filename, strerror(errno));
return -ENODEV;
}
if (strcasecmp(variable, "udev_root") == 0) {
strlcpy(udev_root, value, sizeof(udev_root));
- remove_trailing_char(udev_root, '/');
- continue;
- }
-
- if (strcasecmp(variable, "udev_db") == 0) {
- strlcpy(udev_db_path, value, sizeof(udev_db_path));
- remove_trailing_char(udev_db_path, '/');
+ remove_trailing_chars(udev_root, '/');
continue;
}
if (strcasecmp(variable, "udev_rules") == 0) {
strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
- remove_trailing_char(udev_rules_filename, '/');
+ remove_trailing_chars(udev_rules_filename, '/');
continue;
}
const char *env;
strcpy(udev_root, UDEV_ROOT);
- strcpy(udev_db_path, UDEV_DB);
strcpy(udev_config_filename, UDEV_CONFIG_FILE);
strcpy(udev_rules_filename, UDEV_RULES_FILE);
udev_log_priority = LOG_ERR;
env = getenv("UDEV_CONFIG_FILE");
if (env) {
strlcpy(udev_config_filename, env, sizeof(udev_config_filename));
- remove_trailing_char(udev_config_filename, '/');
+ remove_trailing_chars(udev_config_filename, '/');
}
parse_config_file();
dbg("sysfs_path='%s'", sysfs_path);
dbg("UDEV_CONFIG_FILE='%s'", udev_config_filename);
dbg("udev_root='%s'", udev_root);
- dbg("udev_db='%s'", udev_db_path);
dbg("udev_rules='%s'", udev_rules_filename);
dbg("udev_log=%d", udev_log_priority);
}