vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/script/execute.c (grub_script_execute_sourcecode): Split

Browse source 
off new function grub_script_execute_new_scope. Change callers to use
	either of them as appropriate.
	* grub-core/commands/eval.c: New command eval.
	* docs/grub.texi (Commands): Document it.
This commit is contained in:
Andrey Borzenkov 2013-06-07 18:36:42 +02:00 • committed by Vladimir 'phcoder' Serbinenko
parent 63c2984922
commit 593e430cd6
7 changed files with 50 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
grub-core/Makefile.core.def
View file

@ -703,6 +703,11 @@ module = {
common = commands/echo.c;
};
module = {
name = eval;
common = commands/eval.c;
};
module = {
name = extcmd;
common = commands/extcmd.c;

2
grub-core/normal/menu.c
View file

@ -245,7 +245,7 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
else
grub_env_unset ("default");
grub_script_execute_sourcecode (entry->sourcecode, entry->argc, entry->args);
grub_script_execute_new_scope (entry->sourcecode, entry->argc, entry->args);
if (errs_before != grub_err_printed_errors)
grub_wait_after_message ();

2
grub-core/normal/menu_entry.c
View file

@ -1181,7 +1181,7 @@ run (struct screen *screen)
}
script[size] = '\0';
}
grub_script_execute_sourcecode (script, 0, dummy);
grub_script_execute_new_scope (script, 0, dummy);
grub_free (script);
if (errs_before != grub_err_printed_errors)

33
grub-core/script/execute.c
View file

@ -856,19 +856,10 @@ grub_script_execute_sourcecode_getline (char **line,
/* Execute a source script. */
grub_err_t
grub_script_execute_sourcecode (const char *source, int argc, char **args)
grub_script_execute_sourcecode (const char *source)
{
grub_err_t ret = 0;
struct grub_script *parsed_script;
struct grub_script_scope new_scope;
struct grub_script_scope *old_scope;
new_scope.argv.argc = argc;
new_scope.argv.args = args;
new_scope.flags = 0;
old_scope = scope;
scope = &new_scope;
while (source)
{
@ -880,13 +871,35 @@ grub_script_execute_sourcecode (const char *source, int argc, char **args)
if (! parsed_script)
{
ret = grub_errno;
grub_free (line);
break;
}
ret = grub_script_execute (parsed_script);
grub_script_free (parsed_script);
grub_free (line);
}
return ret;
}
/* Execute a source script in new scope. */
grub_err_t
grub_script_execute_new_scope (const char *source, int argc, char **args)
{
grub_err_t ret = 0;
struct grub_script_scope new_scope;
struct grub_script_scope *old_scope;
new_scope.argv.argc = argc;
new_scope.argv.args = args;
new_scope.flags = 0;
old_scope = scope;
scope = &new_scope;
ret = grub_script_execute_sourcecode (source);
scope = old_scope;
return ret;
}