X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fgrub2%2Fscript.c;h=43259aafa304fb973ed0989a10a4ac36dd8b3b00;hb=5b16418b30c17fa8c49d7a606bb8ab4bdec6f1a8;hp=9c087373ac0454524308fa6da5370a0b86b69cc5;hpb=e8a50ad2461a8efaa4d71ea19692a1b63a0f9bc2;p=petitboot

diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index 9c08737..43259aa 100644
--- a/discover/grub2/script.c
+++ b/discover/grub2/script.c
@@ -9,12 +9,16 @@
 
 #define to_stmt_simple(stmt) \
 	container_of(stmt, struct grub2_statement_simple, st)
+#define to_stmt_block(stmt) \
+	container_of(stmt, struct grub2_statement_block, st)
 #define to_stmt_if(stmt) \
 	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;
@@ -244,7 +248,7 @@ int statement_simple_execute(struct grub2_script *script,
 	entry = script_lookup_function(script, st->argv->argv[0]);
 	if (!entry) {
 		fprintf(stderr, "undefined function '%s'\n", st->argv->argv[0]);
-		return 0;
+		return 1;
 	}
 
 	rc = entry->fn(script, entry->data, st->argv->argc, st->argv->argv);
@@ -252,24 +256,45 @@ int statement_simple_execute(struct grub2_script *script,
 	return rc;
 }
 
-int statement_if_execute(struct grub2_script *script,
+int statement_block_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_block *st = to_stmt_block(statement);
+	return statements_execute(script, st->statements);
+}
+
+/* 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;
+}
 
-	if (rc == 0)
-		case_stmts = st->true_case;
-	else
-		case_stmts = st->false_case;
+int statement_if_execute(struct grub2_script *script,
+		struct grub2_statement *statement)
+{
+	struct grub2_statement_if *st = to_stmt_if(statement);
+	struct grub2_statement *conditional;
+	bool executed;
+	int rc;
+
+	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;
 }
@@ -288,6 +313,9 @@ int statement_menuentry_execute(struct grub2_script *script,
 	} else {
 		opt->option->name = talloc_strdup(opt, "(unknown)");
 	}
+	opt->option->id = talloc_asprintf(opt->option, "%s#%s",
+			script->ctx->device->device->id,
+			opt->option->name);
 
 	script->opt = opt;