udevd: export event queue and event state

[elogind.git] / udev_config.c

diff --git a/udev_config.c b/udev_config.c
index c57e36cd8c21ce5115babf3c23780dbd11788255..192a0b80d2e6055c06f93595c0eb217f909750cc 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -107,7 +107,7 @@ static int parse_config_file(void)
        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;
        }
 
@@ -137,7 +137,8 @@ static int parse_config_file(void)
                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);
@@ -148,19 +149,19 @@ static int parse_config_file(void)
 
                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;
                }
 
@@ -194,7 +195,7 @@ void udev_init_config(void)
        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();