discover: Fix potentially-uninitialised variables

[petitboot] / discover / grub2 / script.c

diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index 239ae38f5e67306408e7c386abc050b03ec5d4d6..e29d43702b1e0099435ab76b2f3966ad559cee90 100644 (file)
--- 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>
 
@@ -9,6 +11,8 @@
 
 #define to_stmt_simple(stmt) \
        container_of(stmt, struct grub2_statement_simple, st)
+#define to_stmt_block(stmt) \
+       container_of(stmt, struct grub2_statement_block, st)
 #define to_stmt_if(stmt) \
        container_of(stmt, struct grub2_statement_if, st)
 #define to_stmt_menuentry(stmt) \
@@ -19,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;
 };
 
@@ -31,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)
 {
@@ -69,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)
@@ -94,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.
  *
@@ -233,6 +259,7 @@ int statement_simple_execute(struct grub2_script *script,
 {
        struct grub2_statement_simple *st = to_stmt_simple(statement);
        struct grub2_symtab_entry *entry;
+       char *pos;
        int rc;
 
        if (!st->argv)
@@ -243,10 +270,21 @@ int statement_simple_execute(struct grub2_script *script,
        if (!st->argv->argc)
                return 0;
 
+       /* is this a var=value assignment? */
+       pos = strchr(st->argv->argv[0], '=');
+       if (pos) {
+               char *name, *value;
+               name = st->argv->argv[0];
+               name = talloc_strndup(st, name, pos - name);
+               value = pos + 1;
+               script_env_set(script, name, value);
+               return 0;
+       }
+
        entry = script_lookup_function(script, st->argv->argv[0]);
        if (!entry) {
-               fprintf(stderr, "undefined function '%s'\n", st->argv->argv[0]);
-               return 0;
+               pb_log("grub2: undefined function '%s'\n", st->argv->argv[0]);
+               return 1;
        }
 
        rc = entry->fn(script, entry->data, st->argv->argc, st->argv->argv);
@@ -254,6 +292,13 @@ int statement_simple_execute(struct grub2_script *script,
        return rc;
 }
 
+int statement_block_execute(struct grub2_script *script,
+               struct grub2_statement *statement)
+{
+       struct grub2_statement_block *st = to_stmt_block(statement);
+       return statements_execute(script, st->statements);
+}
+
 /* returns 0 if the statement was executed, 1 otherwise */
 static int statement_conditional_execute(struct grub2_script *script,
                struct grub2_statement *statement, bool *executed)
@@ -275,7 +320,7 @@ int statement_if_execute(struct grub2_script *script,
        struct grub2_statement_if *st = to_stmt_if(statement);
        struct grub2_statement *conditional;
        bool executed;
-       int rc;
+       int rc = 0;
 
        list_for_each_entry(&st->conditionals->list, conditional, list) {
                rc = statement_conditional_execute(script,
@@ -304,12 +349,18 @@ 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;
 
        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;
@@ -354,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);
 }
@@ -383,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);