[PATCH] fix klibc's broken strlcpy/strlcat

[elogind.git] / udev_config.c

diff --git a/udev_config.c b/udev_config.c
index 54eedb980a19b1db017954529511247ce1e8a8fc..b6f578b27dfb0169ff00d5fb9b0a110b64ad1868 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -171,7 +171,7 @@ static int parse_config_file(void)
                if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
-               strlcpy(line, bufline, count);
+               strlcpy(line, bufline, count+1);
 
                linepos = line;
                retval = get_key(&linepos, &variable, &value);
@@ -182,19 +182,19 @@ static int parse_config_file(void)
 
                if (strcasecmp(variable, "udev_root") == 0) {
                        strlcpy(udev_root, value, sizeof(udev_root));
-                       no_trailing_slash(udev_root);
+                       remove_trailing_char(udev_root, '/');
                        continue;
                }
 
                if (strcasecmp(variable, "udev_db") == 0) {
                        strlcpy(udev_db_path, value, sizeof(udev_db_path));
-                       no_trailing_slash(udev_db_path);
+                       remove_trailing_char(udev_db_path, '/');
                        continue;
                }
 
                if (strcasecmp(variable, "udev_rules") == 0) {
                        strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
-                       no_trailing_slash(udev_rules_filename);
+                       remove_trailing_char(udev_rules_filename, '/');
                        continue;
                }
 
@@ -232,7 +232,7 @@ void udev_init_config(void)
        env = getenv("UDEV_CONFIG_FILE");
        if (env) {
                strlcpy(udev_config_filename, env, sizeof(udev_config_filename));
-               no_trailing_slash(udev_config_filename);
+               remove_trailing_char(udev_config_filename, '/');
        }
 
        parse_config_file();