X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=discover%2Fgrub2%2Fgrub2.h;h=9da5ceeed2a013ca171658d92a00d73998a042ca;hb=e492b596187d283cfbd65a098fe1b2d0dafa311e;hp=07a1e6c7fe3517deb46e4786472cab0312a82f64;hpb=352621fe8719c8488098719240252bc04c303963;p=petitboot

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index 07a1e6c..9da5cee 100644
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -1,22 +1,33 @@
 #ifndef GRUB2_H
 #define GRUB2_H
 
-#include <regex.h>
 #include <stdbool.h>
 #include <list/list.h>
 
 struct grub2_script;
 
 struct grub2_word {
-	const char		*text;
-	bool			expand;
+	enum {
+		GRUB2_WORD_TEXT,
+		GRUB2_WORD_VAR,
+	} type;
+	union {
+		char		*text;
+		const char	*name;
+	};
 	bool			split;
 	struct grub2_word	*next;
+	struct grub2_word	*last;
 	struct list_item	argv_list;
 };
 
 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 {
@@ -58,10 +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;
-	regex_t			var_re;
+	struct list		commands;
+	struct list		symtab;
 };
 
 struct grub2_parser {
@@ -85,8 +104,11 @@ struct grub2_statement *create_statement_if(struct grub2_parser *parser,
 struct grub2_statement *create_statement_block(struct grub2_parser *parser,
 		struct grub2_statements *stmts);
 
-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 *create_word_var(struct grub2_parser *parser,
+		const char *name, bool split);
 
 struct grub2_argv *create_argv(struct grub2_parser *parser);
 
@@ -104,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 */