X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=discover%2Fgrub2%2Fscript.c;h=239ae38f5e67306408e7c386abc050b03ec5d4d6;hb=d39ae394911f945cd4a7789a8b210a5662852c46;hp=8b008c4b91e919172858ec9864b3b6f23dff763c;hpb=5e1b3c27ab320eae17b9c9d75b4111c924860268;p=petitboot

diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index 8b008c4..239ae38 100644
--- a/discover/grub2/script.c
+++ b/discover/grub2/script.c
@@ -13,6 +13,10 @@
 	container_of(stmt, struct grub2_statement_if, st)
 #define to_stmt_menuentry(stmt) \
 	container_of(stmt, struct grub2_statement_menuentry, st)
+#define to_stmt_function(stmt) \
+	container_of(stmt, struct grub2_statement_function, st)
+#define to_stmt_conditional(stmt) \
+	container_of(stmt, struct grub2_statement_conditional, st)
 
 struct env_entry {
 	const char		*name;
@@ -20,6 +24,26 @@ struct env_entry {
 	struct list_item	list;
 };
 
+struct grub2_symtab_entry {
+	const char		*name;
+	grub2_function		fn;
+	void			*data;
+	struct list_item	list;
+};
+
+static struct grub2_symtab_entry *script_lookup_function(
+		struct grub2_script *script, const char *name)
+{
+	struct grub2_symtab_entry *entry;
+
+	list_for_each_entry(&script->symtab, entry, list) {
+		if (!strcmp(entry->name, name))
+			return entry;
+	}
+
+	return NULL;
+}
+
 const char *script_env_get(struct grub2_script *script, const char *name)
 {
 	struct env_entry *entry;
@@ -208,7 +232,7 @@ 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;
+	struct grub2_symtab_entry *entry;
 	int rc;
 
 	if (!st->argv)
@@ -219,13 +243,28 @@ int statement_simple_execute(struct grub2_script *script,
 	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]);
+	entry = script_lookup_function(script, st->argv->argv[0]);
+	if (!entry) {
+		fprintf(stderr, "undefined function '%s'\n", st->argv->argv[0]);
 		return 0;
 	}
 
-	rc = cmd->exec(script, st->argv->argc, st->argv->argv);
+	rc = entry->fn(script, entry->data, st->argv->argc, st->argv->argv);
+
+	return rc;
+}
+
+/* returns 0 if the statement was executed, 1 otherwise */
+static int statement_conditional_execute(struct grub2_script *script,
+		struct grub2_statement *statement, bool *executed)
+{
+	struct grub2_statement_conditional *st = to_stmt_conditional(statement);
+	int rc;
+
+	rc = st->condition->exec(script, st->condition);
+	*executed = (!rc);
+	if (*executed)
+		rc = statements_execute(script, st->statements);
 
 	return rc;
 }
@@ -234,20 +273,19 @@ int statement_if_execute(struct grub2_script *script,
 		struct grub2_statement *statement)
 {
 	struct grub2_statement_if *st = to_stmt_if(statement);
-	struct grub2_statements *case_stmts;
+	struct grub2_statement *conditional;
+	bool executed;
 	int rc;
 
-	rc = st->condition->exec(script, st->condition);
-
-	if (rc == 0)
-		case_stmts = st->true_case;
-	else
-		case_stmts = st->false_case;
+	list_for_each_entry(&st->conditionals->list, conditional, list) {
+		rc = statement_conditional_execute(script,
+				conditional, &executed);
+		if (executed)
+			break;
+	}
 
-	if (case_stmts)
-		statements_execute(script, case_stmts);
-	else
-		rc = 0;
+	if (!executed && st->else_case)
+		rc = statements_execute(script, st->else_case);
 
 	return rc;
 }
@@ -277,6 +315,37 @@ int statement_menuentry_execute(struct grub2_script *script,
 	return 0;
 }
 
+static int function_invoke(struct grub2_script *script,
+		void *data, int argc, char **argv)
+{
+	struct grub2_statement_function *fn = data;
+	char *name;
+	int i;
+
+	/* set positional parameters */
+	for (i = 0; i < argc; i++) {
+		name = talloc_asprintf(script, "$%d", i);
+		script_env_set(script, name, argv[i]);
+	}
+
+	return statements_execute(script, fn->body);
+}
+
+int statement_function_execute(struct grub2_script *script,
+		struct grub2_statement *statement)
+{
+	struct grub2_statement_function *st = to_stmt_function(statement);
+	const char *name;
+
+	if (st->name->type == GRUB2_WORD_VAR)
+		expand_var(script, st->name);
+
+	name = st->name->text;
+	script_register_function(script, name, function_invoke, st);
+
+	return 0;
+}
+
 static void init_env(struct grub2_script *script)
 {
 	struct env_entry *env;
@@ -290,23 +359,17 @@ 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)
+void script_register_function(struct grub2_script *script,
+		const char *name, grub2_function fn,
+		void *data)
 {
-	struct grub2_command *command;
+	struct grub2_symtab_entry *entry;
 
-	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);
+	entry = talloc(script, struct grub2_symtab_entry);
+	entry->fn = fn;
+	entry->name = name;
+	entry->data = data;
+	list_add(&script->symtab, &entry->list);
 }
 
 
@@ -326,7 +389,7 @@ struct grub2_script *create_script(struct grub2_parser *parser,
 	script->ctx = ctx;
 	script->opt = NULL;
 
-	list_init(&script->commands);
+	list_init(&script->symtab);
 	register_builtins(script);
 
 	return script;