X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fgrub2%2Fgrub2.h;h=4d083ae9ed18f8f8bb6cfc2d5d9582ed54a5c78e;hb=f452571550b6c6016698a50c834087c0d8c7575b;hp=5b83fad5d05f38503fd755207de96b8955d800cd;hpb=e8a50ad2461a8efaa4d71ea19692a1b63a0f9bc2;p=petitboot diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h index 5b83fad..4d083ae 100644 --- a/discover/grub2/grub2.h +++ b/discover/grub2/grub2.h @@ -43,6 +43,7 @@ struct grub2_statement { STMT_TYPE_MENUENTRY, STMT_TYPE_IF, STMT_TYPE_BLOCK, + STMT_TYPE_CONDITIONAL, } type; int (*exec)(struct grub2_script *, struct grub2_statement *); @@ -59,11 +60,16 @@ struct grub2_statement_menuentry { struct grub2_statements *statements; }; -struct grub2_statement_if { +struct grub2_statement_conditional { struct grub2_statement st; struct grub2_statement *condition; - struct grub2_statements *true_case; - struct grub2_statements *false_case; + struct grub2_statements *statements; +}; + +struct grub2_statement_if { + struct grub2_statement st; + struct grub2_statements *conditionals; + struct grub2_statements *else_case; }; struct grub2_statement_block { @@ -102,10 +108,14 @@ struct grub2_statement *create_statement_simple(struct grub2_parser *parser, struct grub2_statement *create_statement_menuentry(struct grub2_parser *parser, struct grub2_argv *argv, struct grub2_statements *stmts); +struct grub2_statement *create_statement_conditional( + struct grub2_parser *parser, struct grub2_statement *condition, + struct grub2_statements *statements); + struct grub2_statement *create_statement_if(struct grub2_parser *parser, - struct grub2_statement *condition, - struct grub2_statements *true_case, - struct grub2_statements *false_case); + struct grub2_statement *conditional, + struct grub2_statements *elifs, + struct grub2_statements *else_case); struct grub2_statement *create_statement_block(struct grub2_parser *parser, struct grub2_statements *stmts); @@ -133,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,