#include <string.h>
#include <stdlib.h>
+#include <log/log.h>
#include <types/types.h>
#include <talloc/talloc.h>
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;
};
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)
{
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)
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;
}
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,
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);
}