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

diff --git a/udev_config.c b/udev_config.c
index 77ac38a79..1b6b61426 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -59,6 +59,54 @@ static int string_is_true(const char *str)
 	return 0;
 }
 
+static int get_key(char **line, char **key, char **value)
+{
+	char *linepos;
+	char *temp;
+
+	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;
+	}
+
+	/* terminate key */
+	linepos[0] = '\0';
+	linepos++;
+
+	/* skip whitespace */
+	while (isspace(linepos[0]))
+		linepos++;
+
+	/* get the value*/
+	if (linepos[0] == '"')
+		linepos++;
+	else
+		return -1;
+	*value = linepos;
+
+	temp = strchr(linepos, '"');
+	if (!temp)
+		return -1;
+	temp[0] = '\0';
+
+	return 0;
+}
+
 static void init_variables(void)
 {
 	const char *env;
@@ -86,7 +134,7 @@ static int parse_config_file(void)
 {
 	char line[LINE_SIZE];
 	char *bufline;
-	char *temp;
+	char *linepos;
 	char *variable;
 	char *value;
 	char *buf;
@@ -130,13 +178,14 @@ static int parse_config_file(void)
 			continue;
 
 		strlcpy(line, bufline, count);
-		temp = line;
-		dbg("read '%s'", temp);
+		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("variable='%s', value='%s'", variable, value);
 
@@ -168,27 +217,16 @@ static int parse_config_file(void)
 	return retval;
 }
 
-static void get_dirs(void)
+void udev_init_config(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 *config;
 
-		temp = getenv("UDEV_CONFIG_FILE");
-		if (temp != NULL)
-			strlcpy(udev_config_filename, temp, sizeof(udev_config_filename));
-	}
+	init_variables();
+	sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
+
+	config = getenv("UDEV_CONFIG_FILE");
+	if (config != NULL)
+		strlcpy(udev_config_filename, config, sizeof(udev_config_filename));
 
 	parse_config_file();
 	dbg("sysfs_path='%s'", sysfs_path);
@@ -198,9 +236,3 @@ static void get_dirs(void)
 	dbg("udev_rules_filename='%s'", udev_rules_filename);
 	dbg("udev_log=%d", udev_log);
 }
-
-void udev_init_config(void)
-{
-	init_variables();
-	get_dirs();
-}