X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=204827407d389ff4388d564db77c1a815ede064d;hp=77ac38a791e1f891c5800517cedc3fd0411fd329;hb=b2885eeecf517e82830f585a69ebc9c2c60cfa5e;hpb=e5e322bc627a07d29a07e08f7c96bd644a3ae057

diff --git a/udev_config.c b/udev_config.c
index 77ac38a79..204827407 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
@@ -28,65 +26,70 @@
 #include <unistd.h>
 #include <errno.h>
 #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"
-#include "udev_rules.h"
 
 /* global variables */
-char sysfs_path[PATH_SIZE];
 char udev_root[PATH_SIZE];
-char udev_db_path[PATH_SIZE];
-char udev_rules_filename[PATH_SIZE];
 char udev_config_filename[PATH_SIZE];
-int udev_log;
-int udev_dev_d;
-int udev_hotplug_d;
-
+char udev_rules_filename[PATH_SIZE];
+int udev_log_priority;
+int udev_run;
 
-static int string_is_true(const char *str)
+static int get_key(char **line, char **key, char **value)
 {
-	if (strcasecmp(str, "true") == 0)
-		return 1;
-	if (strcasecmp(str, "yes") == 0)
-		return 1;
-	if (strcasecmp(str, "1") == 0)
-		return 1;
-	return 0;
-}
+	char *linepos;
+	char *temp;
 
-static void init_variables(void)
-{
-	const char *env;
+	linepos = *line;
+	if (!linepos)
+		return -1;
+
+	/* skip whitespace */
+	while (isspace(linepos[0]))
+		linepos++;
+
+	/* get the key */
+	*key = linepos;
+	while (1) {
+		linepos++;
+		if (linepos[0] == '\0')
+			return -1;
+		if (isspace(linepos[0]))
+			break;
+		if (linepos[0] == '=')
+			break;
+	}
 
-	/* If any config values are specified, they will override these values. */
-	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);
+	/* terminate key */
+	linepos[0] = '\0';
+	linepos++;
 
-	udev_log = string_is_true(UDEV_LOG_DEFAULT);
+	/* skip whitespace */
+	while (isspace(linepos[0]))
+		linepos++;
 
-	udev_dev_d = 1;
-	env = getenv("UDEV_NO_DEVD");
-	if (env && string_is_true(env))
-		udev_dev_d = 0;
+	/* get the value*/
+	if (linepos[0] == '"')
+		linepos++;
+	else
+		return -1;
+	*value = linepos;
 
-	udev_hotplug_d = 1;
-	env = getenv("UDEV_NO_HOTPLUGD");
-	if (env && string_is_true(env))
-		udev_hotplug_d = 0;
+	temp = strchr(linepos, '"');
+	if (!temp)
+		return -1;
+	temp[0] = '\0';
+
+	return 0;
 }
 
 static int parse_config_file(void)
 {
 	char line[LINE_SIZE];
 	char *bufline;
-	char *temp;
+	char *linepos;
 	char *variable;
 	char *value;
 	char *buf;
@@ -97,10 +100,9 @@ static int parse_config_file(void)
 	int retval = 0;
 
 	if (file_map(udev_config_filename, &buf, &bufsize) != 0) {
-		dbg("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;
 	}
-	dbg("reading '%s' as config file", udev_config_filename);
 
 	/* loop through the whole file */
 	lineno = 0;
@@ -112,8 +114,7 @@ static int parse_config_file(void)
 		lineno++;
 
 		if (count >= sizeof(line)) {
-			info("line too long, conf line skipped %s, line %d",
-					udev_config_filename, lineno);
+			err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
 			continue;
 		}
 
@@ -129,37 +130,30 @@ static int parse_config_file(void)
 		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
 
-		strlcpy(line, bufline, count);
-		temp = line;
-		dbg("read '%s'", temp);
-
-		retval = parse_get_pair(&temp, &variable, &value);
-		if (retval != 0)
-			info("%s:%d:%Zd: error parsing '%s'",
-			     udev_config_filename, lineno, temp-line, temp);
+		memcpy(line, bufline, count);
+		line[count] = '\0';
 
-		dbg("variable='%s', value='%s'", variable, value);
-
-		if (strcasecmp(variable, "udev_root") == 0) {
-			strlcpy(udev_root, value, sizeof(udev_root));
-			no_trailing_slash(udev_root);
+		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));
 			continue;
 		}
 
-		if (strcasecmp(variable, "udev_db") == 0) {
-			strlcpy(udev_db_path, value, sizeof(udev_db_path));
-			no_trailing_slash(udev_db_path);
+		if (strcasecmp(variable, "udev_root") == 0) {
+			strlcpy(udev_root, value, sizeof(udev_root));
+			remove_trailing_chars(udev_root, '/');
 			continue;
 		}
 
 		if (strcasecmp(variable, "udev_rules") == 0) {
 			strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
-			no_trailing_slash(udev_rules_filename);
+			remove_trailing_chars(udev_rules_filename, '/');
 			continue;
 		}
 
 		if (strcasecmp(variable, "udev_log") == 0) {
-			udev_log = string_is_true(value);
+			udev_log_priority = log_priority(value);
 			continue;
 		}
 	}
@@ -168,39 +162,41 @@ static int parse_config_file(void)
 	return retval;
 }
 
-static void get_dirs(void)
+void udev_config_init(void)
 {
-	char *temp;
-	int retval;
-
-	retval = sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
-	if (retval)
-		dbg("sysfs_get_mnt_path failed");
-
-	/* see if we should try to override any of the default values */
-	if (getenv("UDEV_TEST") != NULL) {
-		temp = getenv("SYSFS_PATH");
-		if (temp != NULL) {
-			strlcpy(sysfs_path, temp, sizeof(sysfs_path));
-			no_trailing_slash(sysfs_path);
-		}
+	const char *env;
 
-		temp = getenv("UDEV_CONFIG_FILE");
-		if (temp != NULL)
-			strlcpy(udev_config_filename, temp, sizeof(udev_config_filename));
+	strcpy(udev_root, UDEV_ROOT);
+	strcpy(udev_config_filename, UDEV_CONFIG_FILE);
+	strcpy(udev_rules_filename, UDEV_RULES_FILE);
+	udev_log_priority = LOG_ERR;
+	udev_run = 1;
+
+	/* disable RUN key execution */
+	env = getenv("UDEV_RUN");
+	if (env && !string_is_true(env))
+		udev_run = 0;
+
+	env = getenv("UDEV_CONFIG_FILE");
+	if (env) {
+		strlcpy(udev_config_filename, env, sizeof(udev_config_filename));
+		remove_trailing_chars(udev_config_filename, '/');
 	}
 
 	parse_config_file();
-	dbg("sysfs_path='%s'", sysfs_path);
-	dbg("udev_root='%s'", udev_root);
-	dbg("udev_config_filename='%s'", udev_config_filename);
-	dbg("udev_db_path='%s'", udev_db_path);
-	dbg("udev_rules_filename='%s'", udev_rules_filename);
-	dbg("udev_log=%d", udev_log);
-}
 
-void udev_init_config(void)
-{
-	init_variables();
-	get_dirs();
+	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("UDEV_CONFIG_FILE='%s'", udev_config_filename);
+	dbg("udev_root='%s'", udev_root);
+	dbg("udev_rules='%s'", udev_rules_filename);
+	dbg("udev_log=%d", udev_log_priority);
 }