X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fscript.c;h=8b008c4b91e919172858ec9864b3b6f23dff763c;hp=568e2509b99bc372d094e91909573c2f174dba73;hb=5e1b3c27ab320eae17b9c9d75b4111c924860268;hpb=0a47d0c3a25552e0661fd919c4f87f990b081245

diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index 568e250..8b008c4 100644
--- a/discover/grub2/script.c
+++ b/discover/grub2/script.c
@@ -2,6 +2,7 @@
 #include <sys/types.h>
 #include <string.h>
 
+#include <types/types.h>
 #include <talloc/talloc.h>
 
 #include "grub2.h"
@@ -19,8 +20,7 @@ struct env_entry {
 	struct list_item	list;
 };
 
-static const char *env_lookup(struct grub2_script *script,
-		const char *name)
+const char *script_env_get(struct grub2_script *script, const char *name)
 {
 	struct env_entry *entry;
 
@@ -31,21 +31,114 @@ static const char *env_lookup(struct grub2_script *script,
 	return NULL;
 }
 
+void script_env_set(struct grub2_script *script,
+		const char *name, const char *value)
+{
+	struct env_entry *e, *entry = NULL;
+
+	list_for_each_entry(&script->environment, e, list) {
+		if (!strcmp(e->name, name)) {
+			entry = e;
+			break;
+		}
+	}
+
+	if (!entry) {
+		entry = talloc(script, struct env_entry);
+		entry->name = name;
+		list_add(&script->environment, &entry->list);
+	}
+
+	entry->value = value;
+}
+
 static bool expand_var(struct grub2_script *script, struct grub2_word *word)
 {
 	const char *val;
 
-	val = env_lookup(script, word->var.name);
+	val = script_env_get(script, word->name);
 	if (!val)
 		val = "";
 
-	word->type = GRUB2_WORD_TEXT;
 	word->text = talloc_strdup(script, val);
 
 	return true;
 }
 
-/* iterate through the words in an argv, looking for GRUB2_WORD_VAR expansions.
+static bool is_delim(char c)
+{
+	return c == ' ' || c == '\t';
+}
+
+/* For non-double-quoted variable expansions, we may need to split the
+ * variable's value into multiple argv items.
+ *
+ * This function sets the word->text to the initial set of non-delimiter chars
+ * in the expanded var value. We then skip any delimiter chars, and (if
+ * required), create the new argv item with the remaining text, and
+ * add it to the argv list, after top_word.
+ */
+static void process_split(struct grub2_script *script,
+		struct grub2_word *top_word,
+		struct grub2_word *word)
+{
+	int i, len, delim_start = -1, delim_end = -1;
+	struct grub2_word *new_word;
+	char *remainder;
+
+	len = strlen(word->text);
+
+	/* Scan our string for the start of a delim (delim_start), and the
+	 * start of any new text (delim_end). */
+	for (i = 0; i < len; i++) {
+		if (is_delim(word->text[i])) {
+			if (delim_start == -1)
+				delim_start = i;
+		} else if (delim_start != -1) {
+			delim_end = i;
+			break;
+		}
+	}
+
+	/* No delim? nothing to do. The process_expansions loop will
+	 * append this word's text to the top word, if necessary
+	 */
+	if (delim_start == -1)
+		return;
+
+	/* Set this word's text value to the text before the delimiter.
+	 * this will get appended to the top word
+	 */
+	word->text[delim_start] = '\0';
+
+	/* No trailing text? If there are no following word tokens, we're done.
+	 * Otherwise, we need to start a new argv item with those tokens */
+	if (delim_end == -1) {
+		if (!word->next)
+			return;
+		remainder = "";
+	} else {
+		remainder = word->text + delim_end;
+	}
+
+	new_word = talloc(script, struct grub2_word);
+	new_word->type = GRUB2_WORD_TEXT;
+	/* if there's no trailing text, we know we don't need to re-split */
+	new_word->split = delim_end != -1;
+	new_word->next = word->next;
+	new_word->last = NULL;
+	new_word->text = talloc_strdup(new_word, remainder);
+
+	/* stitch it into the argv list before this word */
+	list_insert_after(&top_word->argv_list,
+			   &new_word->argv_list);
+
+	/* terminate this word */
+	word->next = NULL;
+}
+
+/* iterate through the words in an argv_list, looking for GRUB2_WORD_VAR
+ * expansions.
  *
  * Once that's done, we may (if split == true) have to split the word to create
  * new argv items
@@ -54,26 +147,51 @@ static void process_expansions(struct grub2_script *script,
 		struct grub2_argv *argv)
 {
 	struct grub2_word *top_word, *word;
+	int i;
+
+	argv->argc = 0;
 
 	list_for_each_entry(&argv->words, top_word, argv_list) {
-		/* expand vars and squash the list of words into the top struct.
-		 * todo: splitting
-		 */
+		argv->argc++;
+
+		/* expand vars and squash the list of words into the head
+		 * of the argv word list */
 		for (word = top_word; word; word = word->next) {
-			if (word->type == GRUB2_WORD_VAR)
+
+			/* if it's a variable, perform the substitution */
+			if (word->type == GRUB2_WORD_VAR) {
 				expand_var(script, word);
+				word->type = GRUB2_WORD_TEXT;
+			}
+
+			/* split; this will potentially insert argv
+			 * entries after top_word. */
+			if (word->split)
+				process_split(script, top_word, word);
+
+			/* accumulate word text into the top word, so
+			 * we end up with a shallow tree of argv data */
+			/* todo: don't do this in process_split */
+			if (word != top_word) {
+				top_word->text = talloc_asprintf_append(
+							top_word->text,
+							"%s", word->text);
+			}
 
-			if (word == top_word)
-				continue;
 
-			top_word->text = talloc_asprintf_append(top_word->text,
-					"%s", word->text);
 		}
 		top_word->next = NULL;
 	}
+
+	/* convert the list to an argv array, to pass to the function */
+	argv->argv = talloc_array(script, char *, argv->argc);
+	i = 0;
+
+	list_for_each_entry(&argv->words, word, argv_list)
+		argv->argv[i++] = word->text;
 }
 
-int statements_execute(struct grub2_script *script,
+static int statements_execute(struct grub2_script *script,
 		struct grub2_statements *stmts)
 {
 	struct grub2_statement *stmt;
@@ -90,13 +208,26 @@ int statement_simple_execute(struct grub2_script *script,
 		struct grub2_statement *statement)
 {
 	struct grub2_statement_simple *st = to_stmt_simple(statement);
+	struct grub2_command *cmd;
+	int rc;
 
 	if (!st->argv)
 		return 0;
 
 	process_expansions(script, st->argv);
 
-	return 0;
+	if (!st->argv->argc)
+		return 0;
+
+	cmd = script_lookup_command(script, st->argv->argv[0]);
+	if (!cmd) {
+		fprintf(stderr, "undefined command '%s'\n", st->argv->argv[0]);
+		return 0;
+	}
+
+	rc = cmd->exec(script, st->argv->argc, st->argv->argv);
+
+	return rc;
 }
 
 int statement_if_execute(struct grub2_script *script,
@@ -125,10 +256,24 @@ int statement_menuentry_execute(struct grub2_script *script,
 		struct grub2_statement *statement)
 {
 	struct grub2_statement_menuentry *st = to_stmt_menuentry(statement);
+	struct discover_boot_option *opt;
 
 	process_expansions(script, st->argv);
+
+	opt = discover_boot_option_create(script->ctx, script->ctx->device);
+	if (st->argv->argc > 0) {
+		opt->option->name = talloc_strdup(opt, st->argv->argv[0]);
+	} else {
+		opt->option->name = talloc_strdup(opt, "(unknown)");
+	}
+
+	script->opt = opt;
+
 	statements_execute(script, st->statements);
 
+	discover_context_add_boot_option(script->ctx, opt);
+	script->opt = NULL;
+
 	return 0;
 }
 
@@ -145,19 +290,44 @@ static void init_env(struct grub2_script *script)
 	list_add(&script->environment, &env->list);
 }
 
+struct grub2_command *script_lookup_command(struct grub2_script *script,
+		const char *name)
+{
+	struct grub2_command *command;
+
+	list_for_each_entry(&script->commands, command, list) {
+		if (!strcmp(command->name, name))
+			return command;
+	}
+
+	return NULL;
+}
+
+void script_register_command(struct grub2_script *script,
+		struct grub2_command *command)
+{
+	list_add(&script->commands, &command->list);
+}
+
 
 void script_execute(struct grub2_script *script)
 {
 	statements_execute(script, script->statements);
 }
 
-struct grub2_script *create_script(void *ctx)
+struct grub2_script *create_script(struct grub2_parser *parser,
+		struct discover_context *ctx)
 {
 	struct grub2_script *script;
 
-	script = talloc(ctx, struct grub2_script);
+	script = talloc(parser, struct grub2_script);
 
 	init_env(script);
+	script->ctx = ctx;
+	script->opt = NULL;
+
+	list_init(&script->commands);
+	register_builtins(script);
 
 	return script;
 }