discover/grub2: Populate option ids

[petitboot] / discover / grub2 / script.c

diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index ec37fbb0c06bc1b8da5984e339c90a27502689a3..67b4b7801f8717d51df2cdbfc68edab97988f082 100644 (file)
--- 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;
@@ -250,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;
 }
@@ -286,6 +304,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;
 
@@ -297,6 +318,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;