X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser-conf.c;h=247e29d734fdea083ee508216271a6103b62b019;hp=14f847d7b31ec8ba00ebdef89b0727c53de81a38;hb=e0040f05dd45c84214bfdef5d4c6eacf9586aa7b;hpb=fa6b8cb1d5e9e586370631b879a36cdf49110504

diff --git a/discover/parser-conf.c b/discover/parser-conf.c
index 14f847d..247e29d 100644
--- a/discover/parser-conf.c
+++ b/discover/parser-conf.c
@@ -58,11 +58,28 @@ char *conf_strip_str(char *s)
 }
 
 /**
- * conf_get_param_pair - Get the next 'name=value' parameter pair.
+ * conf_replace_char - replace one char with another.
+ */
+
+char *conf_replace_char(char *s, char from, char to)
+{
+	if (!s)
+		return NULL;
+
+	for ( ; *s; s++)
+		if (*s == from)
+			*s = to;
+
+	return s;
+}
+
+/**
+ * conf_get_pair - Get the next 'name/value' parameter pair.
  * @str: The string to process.
  * @name_out: Returns a pointer to the name.
  * @value_out: Returns a pointer to the value.
- * @terminator: The pair separator/terminator.
+ * @tdelimiter: The pair separator.
+ * @terminator: The pair terminator.
  *
  * Parses a name=value pair returning pointers in @name_out and @value_out.
  * The pair can be terminated by @terminator or a zero.
@@ -75,18 +92,27 @@ char *conf_strip_str(char *s)
  * string.
  */
 
-char *conf_get_param_pair(char *str, char **name_out, char **value_out,
-		char terminator)
+char *conf_get_pair(struct conf_context __attribute__((unused)) *conf, char *str,
+	char **name_out, char **value_out, char delimiter, char terminator)
 {
 	char *sep, *end;
 
+	*name_out = *value_out = NULL;
+
 	/* terminate the value */
 	end = strchr(str, terminator);
 
 	if (end)
 		*end = 0;
 
-	sep = strchr(str, '=');
+	conf_replace_char(str, '\t', ' ');
+
+	str = conf_strip_str(str);
+
+	if (!str)
+		goto exit;
+
+	sep = strchr(str, delimiter);
 
 	if (!sep) {
 		*name_out = NULL;
@@ -97,6 +123,7 @@ char *conf_get_param_pair(char *str, char **name_out, char **value_out,
 		*value_out = conf_strip_str(sep + 1);
 	}
 
+exit:
 	pb_log("%s: @%s@%s@\n", __func__, *name_out, *value_out);
 
 	return end ? end + 1 : NULL;
@@ -120,6 +147,21 @@ int conf_param_in_list(const char *const *list, const char *param)
 	return 0;
 }
 
+/**
+ * conf_init_global_options - Zero the global option table.
+ */
+
+void conf_init_global_options(struct conf_context *conf)
+{
+	int i;
+
+	if (!conf->global_options)
+		return;
+
+	for (i = 0; conf->global_options[i].name; i++)
+		conf->global_options[i].value = NULL;
+}
+
 /**
  * conf_set_global_option - Set a value in the global option table.
  *
@@ -132,11 +174,13 @@ int conf_set_global_option(struct conf_context *conf, const char *name,
 {
 	int i;
 
+	assert(conf->global_options);
+
 	for (i = 0; conf->global_options[i].name; i++) {
 		if (streq(name, conf->global_options[i].name)) {
 			conf->global_options[i].value
 				= talloc_strdup(conf, value);
-			pb_log("%s: %s:%s\n", __func__, name, value);
+			pb_log("%s: @%s@%s@\n", __func__, name, value);
 			return 1;
 		}
 	}
@@ -157,9 +201,14 @@ const char *conf_get_global_option(struct conf_context *conf,
 {
 	int i;
 
+	assert(conf->global_options);
+
 	for (i = 0; conf->global_options[i].name ;i++)
-		if (streq(name, conf->global_options[i].name))
+		if (streq(name, conf->global_options[i].name)) {
+			pb_log("%s: @%s@%s@\n", __func__, name,
+				conf->global_options[i].value);
 			return conf->global_options[i].value;
+		}
 
 	assert(0 && "unknown global name");
 	return NULL;
@@ -175,8 +224,11 @@ static void conf_parse_buf(struct conf_context *conf)
 {
 	char *pos, *name, *value;
 
+	assert(conf->get_pair);
+	assert(conf->process_pair);
+
 	for (pos = conf->buf; pos;) {
-		pos = conf_get_param_pair(pos, &name, &value, '\n');
+		pos = conf->get_pair(conf, pos, &name, &value, '\n');
 
 		if (!value)
 			continue;
@@ -203,6 +255,7 @@ static void conf_parse_buf(struct conf_context *conf)
 
 int conf_parse(struct conf_context *conf)
 {
+	struct device *dev;
 	int fd, rc;
 	unsigned int i;
 	struct stat stat;
@@ -217,7 +270,7 @@ int conf_parse(struct conf_context *conf)
 
 	for (i = 0; conf->conf_files[i]; i++) {
 		char *filepath = resolve_path(conf->dc,
-			conf->conf_files[i], conf->dc->device_path);
+			conf->conf_files[i], conf->dc->device->device_path);
 
 		pb_log("%s: try: %s\n", __func__, filepath);
 
@@ -257,8 +310,9 @@ int conf_parse(struct conf_context *conf)
 	if (len <= 0)
 		goto out;
 
-	if (!conf->dc->device->icon_file)
-		conf->dc->device->icon_file = talloc_strdup(conf->dc,
+	dev = conf->dc->device->device;
+	if (!dev->icon_file)
+		dev->icon_file = talloc_strdup(dev,
 			generic_icon_file(guess_device_type(conf->dc)));
 
 	conf_parse_buf(conf);