X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fgrub2%2Fscript.c;h=2aaf1d3d2cb1495a63c48fe7d31f72882d921b52;hb=089d0a6eb769d531129a7cd1061493a1a24b4bef;hp=3f5bc236a66911fb54111a8ec7d3916c68454cca;hpb=d4fc42052f99c5841b642f552f178320eab2731e;p=petitboot

diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index 3f5bc23..2aaf1d3 100644
--- a/discover/grub2/script.c
+++ b/discover/grub2/script.c
@@ -1,7 +1,9 @@
 
 #include <sys/types.h>
 #include <string.h>
+#include <stdlib.h>
 
+#include <log/log.h>
 #include <types/types.h>
 #include <talloc/talloc.h>
 
@@ -21,8 +23,8 @@
 	container_of(stmt, struct grub2_statement_conditional, st)
 
 struct env_entry {
-	const char		*name;
-	const char		*value;
+	char			*name;
+	char			*value;
 	struct list_item	list;
 };
 
@@ -33,6 +35,8 @@ struct grub2_symtab_entry {
 	struct list_item	list;
 };
 
+static const char *default_prefix = "/boot/grub";
+
 static struct grub2_symtab_entry *script_lookup_function(
 		struct grub2_script *script, const char *name)
 {
@@ -71,11 +75,13 @@ void script_env_set(struct grub2_script *script,
 
 	if (!entry) {
 		entry = talloc(script, struct env_entry);
-		entry->name = name;
+		entry->name = talloc_strdup(entry, name);
 		list_add(&script->environment, &entry->list);
+	} else {
+		talloc_free(entry->value);
 	}
 
-	entry->value = value;
+	entry->value = talloc_strdup(entry, value);
 }
 
 static bool expand_var(struct grub2_script *script, struct grub2_word *word)
@@ -96,6 +102,24 @@ static bool is_delim(char c)
 	return c == ' ' || c == '\t';
 }
 
+static bool option_is_default(struct grub2_script *script,
+		struct discover_boot_option *opt)
+{
+	unsigned int default_idx;
+	const char *var;
+	char *end;
+
+	var = script_env_get(script, "default");
+	if (!var)
+		return false;
+
+	default_idx = strtoul(var, &end, 10);
+	if (end != var && *end == '\0')
+		return default_idx == script->n_options;
+
+	return !strcmp(opt->option->name, var);
+}
+
 /* For non-double-quoted variable expansions, we may need to split the
  * variable's value into multiple argv items.
  *
@@ -259,7 +283,7 @@ int statement_simple_execute(struct grub2_script *script,
 
 	entry = script_lookup_function(script, st->argv->argv[0]);
 	if (!entry) {
-		fprintf(stderr, "undefined function '%s'\n", st->argv->argv[0]);
+		pb_log("grub2: undefined function '%s'\n", st->argv->argv[0]);
 		return 1;
 	}
 
@@ -333,7 +357,10 @@ int statement_menuentry_execute(struct grub2_script *script,
 
 	statements_execute(script, st->statements);
 
+	opt->option->is_default = option_is_default(script, opt);
+
 	discover_context_add_boot_option(script->ctx, opt);
+	script->n_options++;
 	script->opt = NULL;
 
 	return 0;
@@ -378,7 +405,7 @@ static void init_env(struct grub2_script *script)
 
 	env = talloc(script, struct env_entry);
 	env->name = talloc_strdup(env, "prefix");
-	env->value = talloc_strdup(env, "/");
+	env->value = talloc_strdup(env, default_prefix);
 
 	list_add(&script->environment, &env->list);
 }
@@ -407,11 +434,10 @@ struct grub2_script *create_script(struct grub2_parser *parser,
 {
 	struct grub2_script *script;
 
-	script = talloc(parser, struct grub2_script);
+	script = talloc_zero(parser, struct grub2_script);
 
 	init_env(script);
 	script->ctx = ctx;
-	script->opt = NULL;
 
 	list_init(&script->symtab);
 	register_builtins(script);