X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2Fgrub2.h;h=9da5ceeed2a013ca171658d92a00d73998a042ca;hp=970c500407eb433de3f7b5ff005b4fb21ea61231;hb=5c6263a12dd7f859daa0feba8b58a0558f0ff21c;hpb=c12f6bacbd96fda27252bdb79781e5743c01da60

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 970c500..9da5cee 100644
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -12,12 +12,10 @@ struct grub2_word {
 		GRUB2_WORD_VAR,
 	} type;
 	union {
-		char	*text;
-		struct {
-			const char	*name;
-			bool		split;
-		} var;
+		char		*text;
+		const char	*name;
 	};
+	bool			split;
 	struct grub2_word	*next;
 	struct grub2_word	*last;
 	struct list_item	argv_list;
@@ -25,6 +23,11 @@ struct grub2_word {
 
 struct grub2_argv {
 	struct list		words;
+
+	/* postprocessing (with process_expansions) populates these to hand to
+	 * the grub2_command callbacks */
+	char			**argv;
+	int			argc;
 };
 
 struct grub2_statements {
@@ -66,9 +69,18 @@ struct grub2_statement_block {
 	struct grub2_statements	*statements;
 };
 
+struct grub2_command {
+	const char		*name;
+	int			(*exec)(struct grub2_script *script,
+					int argc, char *argv[]);
+	struct list_item	list;
+};
+
 struct grub2_script {
 	struct grub2_statements	*statements;
 	struct list		environment;
+	struct list		commands;
+	struct list		symtab;
 };
 
 struct grub2_parser {
@@ -114,8 +126,22 @@ int statement_simple_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,
+		struct grub2_statement *statement);
 
 struct grub2_script *create_script(void *ctx);
 
+const char *script_env_get(struct grub2_script *script, const char *name);
+
+void script_env_set(struct grub2_script *script,
+		const char *name, const char *value);
+
+void script_register_command(struct grub2_script *script,
+		struct grub2_command *command);
+
+struct grub2_command *script_lookup_command(struct grub2_script *script,
+		const char *name);
+
+void register_builtins(struct grub2_script *script);
 #endif /* GRUB2_H */