X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_config.c;h=45b11de2aa573ef3485e7ef80fe5a6e8a0843e9a;hb=29e8ed4c27a311be32cc039f3d284d9836f3021d;hp=26ecf6291c8a2a856825081b1090b5fd386cb70b;hpb=63f61c5cf639953aa38e025485919b0aa1c49b59;p=elogind.git

diff --git a/udev_config.c b/udev_config.c
index 26ecf6291..45b11de2a 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>
@@ -38,7 +35,7 @@
 #include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
-#include "namedev.h"
+#include "udev_rules.h"
 
 /* global variables */
 char sysfs_path[PATH_SIZE];
@@ -62,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;
@@ -89,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;
@@ -133,15 +178,16 @@ static int parse_config_file(void)
 			continue;
 
 		strlcpy(line, bufline, count);
-		temp = line;
-		dbg_parse("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_parse("variable='%s', value='%s'", variable, value);
+		dbg("variable='%s', value='%s'", variable, value);
 
 		if (strcasecmp(variable, "udev_root") == 0) {
 			strlcpy(udev_root, value, sizeof(udev_root));
@@ -171,17 +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");
+	init_variables();
+	sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
 
 	/* see if we should try to override any of the default values */
 	if (getenv("UDEV_TEST") != NULL) {
+		char *temp;
+
 		temp = getenv("SYSFS_PATH");
 		if (temp != NULL) {
 			strlcpy(sysfs_path, temp, sizeof(sysfs_path));
@@ -201,9 +246,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();
-}