/*
* udev_config.c
*
- * Userspace devfs
- *
* Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2004, 2005 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
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 (bufline[0] == COMMENT_CHARACTER)
continue;
- strlcpy(line, bufline, count+1);
+ memcpy(line, bufline, count);
+ line[count] = '\0';
linepos = line;
retval = get_key(&linepos, &variable, &value);
if (strcasecmp(variable, "udev_root") == 0) {
strlcpy(udev_root, value, sizeof(udev_root));
- remove_trailing_char(udev_root, '/');
+ remove_trailing_chars(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_db_path, '/');
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;
}
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();