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

diff --git a/udev_config.c b/udev_config.c
index cade81cf2..77ac38a79 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,157 +30,141 @@
 #include <ctype.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 "namedev.h"
+#include "udev_rules.h"
 
 /* global variables */
-char sysfs_path[SYSFS_PATH_MAX];
-char udev_root[PATH_MAX];
-char udev_db_filename[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_sleep;
+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;
 	if (strcasecmp(str, "yes") == 0)
 		return 1;
+	if (strcasecmp(str, "1") == 0)
+		return 1;
 	return 0;
 }
 
 static void init_variables(void)
 {
-	/* fill up the defaults.  
-	 * If any config values are specified, they will
-	 * override these values. */
-	strfieldcpy(udev_root, UDEV_ROOT);
-	strfieldcpy(udev_db_filename, 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_sleep = 1;
-	if (getenv("UDEV_NO_SLEEP") != NULL)
-		udev_sleep = 0;
-}
-
-#define set_var(_name, _var)				\
-	if (strcasecmp(variable, _name) == 0) {		\
-		dbg_parse("%s = '%s'", _name, value);	\
-		strncpy(_var, value, sizeof(_var));	\
-	}
-
-#define set_bool(_name, _var)				\
-	if (strcasecmp(variable, _name) == 0) {		\
-		dbg_parse("%s = '%s'", _name, value);	\
-		_var = string_is_true(value);		\
-	}
-
-int parse_get_pair(char **orig_string, char **left, char **right)
-{
-	char *temp;
-	char *string = *orig_string;
+	const char *env;
 
-	if (!string)
-		return -ENODEV;
+	/* 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);
 
-	/* eat any whitespace */
-	while (isspace(*string) || *string == ',')
-		++string;
-
-	/* split based on '=' */
-	temp = strsep(&string, "=");
-	*left = temp;
-	if (!string)
-		return -ENODEV;
+	udev_log = string_is_true(UDEV_LOG_DEFAULT);
 
-	/* take the right side and strip off the '"' */
-	while (isspace(*string))
-		++string;
-	if (*string == '"')
-		++string;
-	else
-		return -ENODEV;
+	udev_dev_d = 1;
+	env = getenv("UDEV_NO_DEVD");
+	if (env && string_is_true(env))
+		udev_dev_d = 0;
 
-	temp = strsep(&string, "\"");
-	if (!string || *temp == '\0')
-		return -ENODEV;
-	*right = temp;
-	*orig_string = string;
-	
-	return 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[255];
+	char line[LINE_SIZE];
+	char *bufline;
 	char *temp;
 	char *variable;
 	char *value;
-	FILE *fd;
-	int lineno = 0;
+	char *buf;
+	size_t bufsize;
+	size_t cur;
+	size_t count;
+	int lineno;
 	int retval = 0;
-	
-	fd = fopen(udev_config_filename, "r");
-	if (fd != NULL) {
-		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 */
-	while (1) {
-		/* get a line */
-		temp = fgets(line, sizeof(line), fd);
-		if (temp == NULL)
-			goto exit;
+	lineno = 0;
+	cur = 0;
+	while (cur < bufsize) {
+		count = buf_get_line(buf, bufsize, cur);
+		bufline = &buf[cur];
+		cur += count+1;
 		lineno++;
 
-		dbg_parse("read '%s'", temp);
-
-		/* eat the whitespace at the beginning of the line */
-		while (isspace(*temp))
-			++temp;
-
-		/* empty line? */
-		if (*temp == 0x00)
+		if (count >= sizeof(line)) {
+			info("line too long, conf line skipped %s, line %d",
+					udev_config_filename, lineno);
+			continue;
+		}
+
+		/* eat the whitespace */
+		while ((count > 0) && isspace(bufline[0])) {
+			bufline++;
+			count--;
+		}
+		if (count == 0)
 			continue;
 
 		/* see if this is a comment */
-		if (*temp == COMMENT_CHARACTER)
+		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)
-			break;
-		
-		dbg_parse("variable = '%s', value = '%s'", variable, value);
-
-		set_var("udev_root", udev_root);
-		set_var("udev_db", udev_db_filename);
-		set_var("udev_rules", udev_rules_filename);
-		set_var("udev_permissions", udev_permissions_filename);
-		set_var("default_mode", default_mode_str);
-		set_var("default_owner", default_owner_str);
-		set_var("default_group", default_group_str);
-		set_bool("udev_log", udev_log);
+		if (retval != 0)
+			info("%s:%d:%Zd: error parsing '%s'",
+			     udev_config_filename, lineno, temp-line, temp);
+
+		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);
+			continue;
+		}
+
+		if (strcasecmp(variable, "udev_db") == 0) {
+			strlcpy(udev_db_path, value, sizeof(udev_db_path));
+			no_trailing_slash(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);
+			continue;
+		}
+
+		if (strcasecmp(variable, "udev_log") == 0) {
+			udev_log = string_is_true(value);
+			continue;
+		}
 	}
-	dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
-		  lineno, temp - line, temp);
-exit:
-	fclose(fd);
+
+	file_unmap(buf, bufsize);
 	return retval;
 }
 
@@ -192,37 +173,30 @@ static void get_dirs(void)
 	char *temp;
 	int retval;
 
-	retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
+	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 */
-	temp = getenv("UDEV_TEST");
-	if (temp != NULL) {
-		/* hm testing is happening, use the specified values, if they are present */
+	if (getenv("UDEV_TEST") != NULL) {
 		temp = getenv("SYSFS_PATH");
-		if (temp)
-			strfieldcpy(sysfs_path, temp);
+		if (temp != NULL) {
+			strlcpy(sysfs_path, temp, sizeof(sysfs_path));
+			no_trailing_slash(sysfs_path);
+		}
+
 		temp = getenv("UDEV_CONFIG_FILE");
-		if (temp)
-			strfieldcpy(udev_config_filename, temp);
+		if (temp != NULL)
+			strlcpy(udev_config_filename, temp, sizeof(udev_config_filename));
 	}
-	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_filename = %s", udev_db_filename);
-	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);
 	parse_config_file();
-
-	dbg_parse("udev_root = %s", udev_root);
-	dbg_parse("udev_config_filename = %s", udev_config_filename);
-	dbg_parse("udev_db_filename = %s", udev_db_filename);
-	dbg_parse("udev_rules_filename = %s", udev_rules_filename);
-	dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
-	dbg_parse("udev_log_str = %d", udev_log);
+	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)
@@ -230,5 +204,3 @@ void udev_init_config(void)
 	init_variables();
 	get_dirs();
 }
-
-