From 24236269ce5126dfa60af60a925da503a7338c4d Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Sun, 18 Mar 2012 16:20:38 -0700
Subject: [PATCH 1/1] Add new member get_pair to conf parser context

To allow parsers more control over finding paramerter pairs
add a new member get_pair to the parser struct conf_context.
Initialize get_pair=conf_get_pair_equal for existing parsers.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 discover/kboot-parser.c  |  1 +
 discover/parser-conf.c   | 12 +++++++++++-
 discover/parser-conf.h   |  2 ++
 discover/yaboot-parser.c |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index ab508ec..5fabc94 100644
--- a/discover/kboot-parser.c
+++ b/discover/kboot-parser.c
@@ -144,6 +144,7 @@ static int kboot_parse(struct discover_context *dc)
 	conf->global_options = kboot_global_options,
 	conf_init_global_options(conf);
 	conf->conf_files = kboot_conf_files,
+	conf->get_pair = conf_get_pair_equal;
 	conf->process_pair = kboot_process_pair;
 	conf->parser_info = (void *)kboot_ignored_names,
 
diff --git a/discover/parser-conf.c b/discover/parser-conf.c
index a21efc4..be19932 100644
--- a/discover/parser-conf.c
+++ b/discover/parser-conf.c
@@ -155,6 +155,9 @@ 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;
 }
@@ -171,6 +174,8 @@ 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
@@ -196,6 +201,8 @@ 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)) {
 			pb_log("%s: @%s@%s@\n", __func__, name,
@@ -217,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_pair_equal(conf, pos, &name, &value, '\n');
+		pos = conf->get_pair(conf, pos, &name, &value, '\n');
 
 		if (!value)
 			continue;
diff --git a/discover/parser-conf.h b/discover/parser-conf.h
index 6aa0701..efeb4f3 100644
--- a/discover/parser-conf.h
+++ b/discover/parser-conf.h
@@ -33,6 +33,8 @@ struct conf_context {
 	struct conf_global_option *global_options;
 	const char *const *conf_files;
 
+	char *(*get_pair)(struct conf_context *conf, char *str, char **name_out,
+		char **value_out, char terminator);
 	void (*process_pair)(struct conf_context *conf, const char *name,
 		char *value);
 	void (*finish)(struct conf_context *conf);
diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c
index ace9945..4306492 100644
--- a/discover/yaboot-parser.c
+++ b/discover/yaboot-parser.c
@@ -301,6 +301,7 @@ static int yaboot_parse(struct discover_context *dc)
 	conf->global_options = yaboot_global_options,
 	conf_init_global_options(conf);
 	conf->conf_files = yaboot_conf_files,
+	conf->get_pair = conf_get_pair_equal;
 	conf->process_pair = yaboot_process_pair;
 	conf->finish = yaboot_finish;
 	conf->parser_info = state = talloc_zero(conf, struct yaboot_state);
-- 
2.39.2