discover/grub2: Implement multiple-arv variable splitting

[petitboot] / discover / grub2 / parser-api.c

diff --git a/discover/grub2/parser-api.c b/discover/grub2/parser-api.c
index 37c88a264d750590f282bf0bfa39262ec9b7c2f5..aa5997851a7ad42947e6810e2deb41b7f1d1bba1 100644 (file)
--- a/discover/grub2/parser-api.c
+++ b/discover/grub2/parser-api.c
@@ -14,20 +14,24 @@ struct grub2_statements *create_statements(struct grub2_parser *parser)
 struct grub2_statement *create_statement_simple(struct grub2_parser *parser,
                struct grub2_argv *argv)
 {
-       struct grub2_statement *stmt = talloc(parser, struct grub2_statement);
-       stmt->type = STMT_TYPE_SIMPLE;
-       stmt->simple.argv = argv;
-       return stmt;
+       struct grub2_statement_simple *stmt =
+               talloc(parser, struct grub2_statement_simple);
+       stmt->st.type = STMT_TYPE_SIMPLE;
+       stmt->st.exec = statement_simple_execute;
+       stmt->argv = argv;
+       return &stmt->st;
 }
 
 struct grub2_statement *create_statement_menuentry(struct grub2_parser *parser,
                struct grub2_argv *argv, struct grub2_statements *stmts)
 {
-       struct grub2_statement *stmt = talloc(parser, struct grub2_statement);
-       stmt->type = STMT_TYPE_MENUENTRY;
-       stmt->menuentry.argv = argv;
-       stmt->menuentry.statements = stmts;
-       return stmt;
+       struct grub2_statement_menuentry *stmt =
+               talloc(parser, struct grub2_statement_menuentry);
+       stmt->st.type = STMT_TYPE_MENUENTRY;
+       stmt->st.exec = statement_menuentry_execute;
+       stmt->argv = argv;
+       stmt->statements = stmts;
+       return &stmt->st;
 }
 
 struct grub2_statement *create_statement_if(struct grub2_parser *parser,
@@ -35,21 +39,25 @@ struct grub2_statement *create_statement_if(struct grub2_parser *parser,
                struct grub2_statements *true_case,
                struct grub2_statements *false_case)
 {
-       struct grub2_statement *stmt = talloc(parser, struct grub2_statement);
-       stmt->type = STMT_TYPE_IF;
-       stmt->ifstmt.condition = condition;
-       stmt->ifstmt.true_case = true_case;
-       stmt->ifstmt.false_case = false_case;
-       return stmt;
+       struct grub2_statement_if *stmt =
+               talloc(parser, struct grub2_statement_if);
+       stmt->st.type = STMT_TYPE_IF;
+       stmt->st.exec = statement_if_execute;
+       stmt->condition = condition;
+       stmt->true_case = true_case;
+       stmt->false_case = false_case;
+       return &stmt->st;
 }
 
 struct grub2_statement *create_statement_block(struct grub2_parser *parser,
                struct grub2_statements *stmts)
 {
-       struct grub2_statement *stmt = talloc(parser, struct grub2_statement);
-       stmt->type = STMT_TYPE_BLOCK;
-       stmt->block.statements = stmts;
-       return stmt;
+       struct grub2_statement_block *stmt =
+               talloc(parser, struct grub2_statement_block);
+       stmt->st.type = STMT_TYPE_BLOCK;
+       stmt->st.exec = NULL;
+       stmt->statements = stmts;
+       return &stmt->st;
 }
 
 void statement_append(struct grub2_statements *stmts,
@@ -60,14 +68,27 @@ void statement_append(struct grub2_statements *stmts,
        list_add_tail(&stmts->list, &stmt->list);
 }
 
-struct grub2_word *create_word(struct grub2_parser *parser, const char *text,
-               bool expand, bool split)
+struct grub2_word *create_word_text(struct grub2_parser *parser,
+               const char *text)
 {
        struct grub2_word *word = talloc(parser, struct grub2_word);
+       word->type = GRUB2_WORD_TEXT;
+       word->split = false;
        word->text = talloc_strdup(word, text);
-       word->expand = expand;
+       word->next = NULL;
+       word->last = word;
+       return word;
+}
+
+struct grub2_word *create_word_var(struct grub2_parser *parser,
+               const char *name, bool split)
+{
+       struct grub2_word *word = talloc(parser, struct grub2_word);
+       word->type = GRUB2_WORD_VAR;
+       word->name = talloc_strdup(word, name);
        word->split = split;
        word->next = NULL;
+       word->last = word;
        return word;
 }
 
@@ -85,5 +106,6 @@ void argv_append(struct grub2_argv *argv, struct grub2_word *word)
 
 void word_append(struct grub2_word *w1, struct grub2_word *w2)
 {
-       w1->next = w2;
+       w1->last->next = w2;
+       w1->last = w2;
 }