discover/grub2: fix comment handling

[petitboot] / discover / grub2 / script.c

diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index 9c087373ac0454524308fa6da5370a0b86b69cc5..239ae38f5e67306408e7c386abc050b03ec5d4d6 100644 (file)
--- a/discover/grub2/script.c
+++ b/discover/grub2/script.c
@@ -15,6 +15,8 @@
        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;
@@ -252,24 +254,38 @@ int statement_simple_execute(struct grub2_script *script,
        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;
+}
+
 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;
 }