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

diff --git a/udev_config.c b/udev_config.c
index 773ee67f9..3f226b9d7 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -1,10 +1,6 @@
 /*
- * udev_config.c
- *
- * Userspace devfs
- *
- * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * 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
@@ -17,7 +13,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -30,19 +26,12 @@
 #include <ctype.h>
 #include <syslog.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "udev_version.h"
-#include "logging.h"
 
 /* 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];
+char udev_rules_dir[PATH_SIZE];
 int udev_log_priority;
 int udev_run;
 
@@ -109,7 +98,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;
 	}
 
@@ -139,30 +128,25 @@ 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);
 		if (retval != 0) {
-			err("error parsing %s, line %d:%d", udev_config_filename, lineno, (int) (linepos-line));
+			err("error parsing %s, line %d:%d", udev_config_filename, lineno, (int)(linepos-line));
 			continue;
 		}
 
 		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, '/');
+			strlcpy(udev_rules_dir, value, sizeof(udev_rules_dir));
+			remove_trailing_chars(udev_rules_dir, '/');
 			continue;
 		}
 
@@ -176,17 +160,15 @@ static int parse_config_file(void)
 	return retval;
 }
 
-void udev_init_config(void)
+void udev_config_init(void)
 {
 	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);
+	strcpy(udev_rules_dir, UDEV_RULES_DIR);
 	udev_log_priority = LOG_ERR;
 	udev_run = 1;
-	sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
 
 	/* disable RUN key execution */
 	env = getenv("UDEV_RUN");
@@ -196,19 +178,23 @@ 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();
 
+	env = getenv("UDEV_ROOT");
+	if (env) {
+		strlcpy(udev_root, env, sizeof(udev_root));
+		remove_trailing_chars(udev_root, '/');
+	}
+
 	env = getenv("UDEV_LOG");
 	if (env)
 		udev_log_priority = log_priority(env);
 
-	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_rules='%s'", udev_rules_dir);
 	dbg("udev_log=%d", udev_log_priority);
 }