X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=1b6b6142600dbb19221cb5767cf0d8c29f5f7bc3;hp=198473936f08118c1d6c91d23efeb20be2b1b9dd;hb=65005a7f81f86590f7f03bd3d4019c485d0e3c77;hpb=2b41e68a08548ce44b4d145900dab2bb04cd34f7

diff --git a/udev_config.c b/udev_config.c
index 198473936..1b6b61426 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -21,9 +21,6 @@
  *
  */
 
-/* define this to enable parsing debugging */
-/* #define DEBUG_PARSER */
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -33,27 +30,25 @@
 #include <ctype.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
-#include "namedev.h"
+#include "udev_rules.h"
 
 /* global variables */
-char sysfs_path[SYSFS_PATH_MAX];
-char udev_root[PATH_MAX];
-char udev_db_path[PATH_MAX+NAME_MAX];
-char udev_permissions_filename[PATH_MAX+NAME_MAX];
-char udev_rules_filename[PATH_MAX+NAME_MAX];
-char udev_config_filename[PATH_MAX+NAME_MAX];
-char default_mode_str[MODE_SIZE];
-char default_owner_str[OWNER_SIZE];
-char default_group_str[GROUP_SIZE];
+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;
 
 
-static int string_is_true(char *str)
+static int string_is_true(const char *str)
 {
 	if (strcasecmp(str, "true") == 0)
 		return 1;
@@ -64,66 +59,82 @@ static int string_is_true(char *str)
 	return 0;
 }
 
-static void init_variables(void)
-{
-	char *env;
-
-	/* fill up the defaults.  
-	 * If any config values are specified, they will
-	 * override these values. */
-	strfieldcpy(udev_root, UDEV_ROOT);
-	strfieldcpy(udev_db_path, UDEV_DB);
-	strfieldcpy(udev_config_filename, UDEV_CONFIG_FILE);
-	strfieldcpy(udev_rules_filename, UDEV_RULES_FILE);
-	strfieldcpy(udev_permissions_filename, UDEV_PERMISSION_FILE);
-	udev_log = string_is_true(UDEV_LOG_DEFAULT);
-
-	udev_dev_d = 1;
-	env = getenv("UDEV_NO_DEVD");
-	if (env && string_is_true(env))
-		udev_dev_d = 0;
-}
-
-int parse_get_pair(char **orig_string, char **left, char **right)
+static int get_key(char **line, char **key, char **value)
 {
+	char *linepos;
 	char *temp;
-	char *string = *orig_string;
 
-	if (!string)
-		return -ENODEV;
+	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;
+	}
 
-	/* eat any whitespace */
-	while (isspace(*string) || *string == ',')
-		++string;
+	/* terminate key */
+	linepos[0] = '\0';
+	linepos++;
 
-	/* split based on '=' */
-	temp = strsep(&string, "=");
-	*left = temp;
-	if (!string)
-		return -ENODEV;
+	/* skip whitespace */
+	while (isspace(linepos[0]))
+		linepos++;
 
-	/* take the right side and strip off the '"' */
-	while (isspace(*string))
-		++string;
-	if (*string == '"')
-		++string;
+	/* get the value*/
+	if (linepos[0] == '"')
+		linepos++;
 	else
-		return -ENODEV;
+		return -1;
+	*value = linepos;
+
+	temp = strchr(linepos, '"');
+	if (!temp)
+		return -1;
+	temp[0] = '\0';
 
-	temp = strsep(&string, "\"");
-	if (!string || *temp == '\0')
-		return -ENODEV;
-	*right = temp;
-	*orig_string = string;
-	
 	return 0;
 }
 
+static void init_variables(void)
+{
+	const char *env;
+
+	/* 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);
+
+	udev_log = string_is_true(UDEV_LOG_DEFAULT);
+
+	udev_dev_d = 1;
+	env = getenv("UDEV_NO_DEVD");
+	if (env && string_is_true(env))
+		udev_dev_d = 0;
+
+	udev_hotplug_d = 1;
+	env = getenv("UDEV_NO_HOTPLUGD");
+	if (env && string_is_true(env))
+		udev_hotplug_d = 0;
+}
+
 static int parse_config_file(void)
 {
 	char line[LINE_SIZE];
 	char *bufline;
-	char *temp;
+	char *linepos;
 	char *variable;
 	char *value;
 	char *buf;
@@ -133,12 +144,11 @@ static int parse_config_file(void)
 	int lineno;
 	int retval = 0;
 
-	if (file_map(udev_config_filename, &buf, &bufsize) == 0) {
-		dbg("reading '%s' as config file", udev_config_filename);
-	} else {
+	if (file_map(udev_config_filename, &buf, &bufsize) != 0) {
 		dbg("can't open '%s' as config file", udev_config_filename);
 		return -ENODEV;
 	}
+	dbg("reading '%s' as config file", udev_config_filename);
 
 	/* loop through the whole file */
 	lineno = 0;
@@ -149,7 +159,7 @@ static int parse_config_file(void)
 		cur += count+1;
 		lineno++;
 
-		if (count >= LINE_SIZE) {
+		if (count >= sizeof(line)) {
 			info("line too long, conf line skipped %s, line %d",
 					udev_config_filename, lineno);
 			continue;
@@ -167,112 +177,62 @@ static int parse_config_file(void)
 		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
 
-		strncpy(line, bufline, count);
-		line[count] = '\0';
-		temp = line;
-		dbg_parse("read '%s'", temp);
+		strlcpy(line, bufline, count);
+		dbg("read '%s'", line);
 
-		retval = parse_get_pair(&temp, &variable, &value);
-		if (retval != 0)
-			info("%s:%d:%Zd: error parsing '%s'",
-			     udev_config_filename, lineno, temp-line, temp);
+		linepos = line;
+		retval = get_key(&linepos, &variable, &value);
+		if (retval != 0) {
+			info("error parsing %s, line %d:%d", udev_config_filename, lineno, (int) (linepos-line));
+			continue;
+		}
 
-		dbg_parse("variable='%s', value='%s'", variable, value);
+		dbg("variable='%s', value='%s'", variable, value);
 
 		if (strcasecmp(variable, "udev_root") == 0) {
-			strfieldcpy(udev_root, value);
+			strlcpy(udev_root, value, sizeof(udev_root));
 			no_trailing_slash(udev_root);
 			continue;
 		}
 
 		if (strcasecmp(variable, "udev_db") == 0) {
-			strfieldcpy(udev_db_path, value);
+			strlcpy(udev_db_path, value, sizeof(udev_db_path));
 			no_trailing_slash(udev_db_path);
 			continue;
 		}
 
 		if (strcasecmp(variable, "udev_rules") == 0) {
-			strfieldcpy(udev_rules_filename, value);
+			strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
 			no_trailing_slash(udev_rules_filename);
 			continue;
 		}
 
-		if (strcasecmp(variable, "udev_permissions") == 0) {
-			strfieldcpy(udev_permissions_filename, value);
-			no_trailing_slash(udev_permissions_filename);
-			continue;
-		}
-
-		if (strcasecmp(variable, "default_mode") == 0) {
-			strfieldcpy(default_mode_str, value);
-			continue;
-		}
-
-		if (strcasecmp(variable, "default_owner") == 0) {
-			strfieldcpy(default_owner_str, value);
-			continue;
-		}
-
-		if (strcasecmp(variable, "default_group") == 0) {
-			strfieldcpy(default_group_str, value);
-			continue;
-		}
-
 		if (strcasecmp(variable, "udev_log") == 0) {
 			udev_log = string_is_true(value);
 			continue;
 		}
-
-		info("%s:%d:%Zd: unknown key '%s'",
-		     udev_config_filename, lineno, temp-line, temp);
 	}
 
 	file_unmap(buf, bufsize);
 	return retval;
 }
 
-static void get_dirs(void)
+void udev_init_config(void)
 {
-	char *temp;
-	int retval;
-
-	retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-	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) {
-			strfieldcpy(sysfs_path, temp);
-			no_trailing_slash(sysfs_path);
-		}
+	const char *config;
 
-		temp = getenv("UDEV_CONFIG_FILE");
-		if (temp != NULL)
-			strfieldcpy(udev_config_filename, temp);
-	}
+	init_variables();
+	sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
 
-	dbg("sysfs_path='%s'", sysfs_path);
-	dbg_parse("udev_root = %s", udev_root);
-	dbg_parse("udev_config_filename = %s", udev_config_filename);
-	dbg_parse("udev_db_path = %s", udev_db_path);
-	dbg_parse("udev_rules_filename = %s", udev_rules_filename);
-	dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
-	dbg_parse("udev_log = %d", udev_log);
+	config = getenv("UDEV_CONFIG_FILE");
+	if (config != NULL)
+		strlcpy(udev_config_filename, config, sizeof(udev_config_filename));
 
 	parse_config_file();
-
-	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_permissions_filename = %s", udev_permissions_filename);
-	dbg("udev_log_str = %d", udev_log);
-}
-
-void udev_init_config(void)
-{
-	init_variables();
-	get_dirs();
+	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);
 }