X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=b8c4ffc8edbfa0d2e23ea73b195f731042d8a992;hp=773ee67f9e1a48abff33430ec7cc8ea95a65063f;hb=f3c14c68499d318b2beb56cee7c5f88f2c04dc62;hpb=972d318a3123b00d0ed6b78bbcf70a0965841a8e

diff --git a/udev_config.c b/udev_config.c
index 773ee67f9..b8c4ffc8e 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -1,10 +1,8 @@
 /*
  * 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
@@ -139,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);
@@ -150,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;
 		}
 
@@ -196,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();