discover/grub2: Implement statement_block_execute

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index c7f43de252e9623732e699005df535bf0327f583..4d083ae9ed18f8f8bb6cfc2d5d9582ed54a5c78e 100644 (file)
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -143,6 +143,8 @@ void script_execute(struct grub2_script *script);
 
 int statement_simple_execute(struct grub2_script *script,
                struct grub2_statement *statement);
+int statement_block_execute(struct grub2_script *script,
+               struct grub2_statement *statement);
 int statement_if_execute(struct grub2_script *script,
                struct grub2_statement *statement);
 int statement_menuentry_execute(struct grub2_script *script,

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 292ce0725b6af6bdffecc8ddad80c9e11f660460..6d3ff2117140dd9d4b3b8a1de7643fa1cd3429ac 100644 (file)
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -227,7 +227,7 @@ struct grub2_statement *create_statement_block(struct grub2_parser *parser,
        struct grub2_statement_block *stmt =
                talloc(parser, struct grub2_statement_block);
        stmt->st.type = STMT_TYPE_BLOCK;
-       stmt->st.exec = NULL;
+       stmt->st.exec = statement_block_execute;
        stmt->statements = stmts;
        return &stmt->st;
 }

diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index 5fb13aa4f0979e24451471df8db627c4802ee26b..43259aafa304fb973ed0989a10a4ac36dd8b3b00 100644 (file)
--- a/discover/grub2/script.c
+++ b/discover/grub2/script.c
@@ -9,6 +9,8 @@
 
 #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) \
@@ -254,6 +256,13 @@ int statement_simple_execute(struct grub2_script *script,
        return rc;
 }
 
+int statement_block_execute(struct grub2_script *script,
+               struct grub2_statement *statement)
+{
+       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)