2006-12-11 Marco Gerards <marco@gnu.org>
* normal/menu_entry.c (run): Fix off by one bug so the last line is executed. Move the loader check to outside the loop.
This commit is contained in:
parent
ef87571464
commit
957b3a3e17
2 changed files with 10 additions and 5 deletions
|
@ -1,3 +1,8 @@
|
|||
2006-12-11 Marco Gerards <marco@gnu.org>
|
||||
|
||||
* normal/menu_entry.c (run): Fix off by one bug so the last line
|
||||
is executed. Move the loader check to outside the loop.
|
||||
|
||||
2006-12-08 Hollis Blanchard <hollis@penguinppc.org>
|
||||
|
||||
* kern/powerpc/ieee1275/cmain.c (cmain): Mark r3 and r4 as `UNUSED'.
|
||||
|
|
|
@ -1007,7 +1007,7 @@ run (struct screen *screen)
|
|||
|
||||
|
||||
/* Execute the script, line for line. */
|
||||
while (currline < screen->num_lines - 1)
|
||||
while (currline < screen->num_lines)
|
||||
{
|
||||
editor_getline (&nextline);
|
||||
parsed_script = grub_script_parse (nextline, editor_getline);
|
||||
|
@ -1018,15 +1018,15 @@ run (struct screen *screen)
|
|||
|
||||
/* The parsed script was executed, throw it away. */
|
||||
grub_script_free (parsed_script);
|
||||
|
||||
if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ())
|
||||
/* Implicit execution of boot, only if something is loaded. */
|
||||
grub_command_execute ("boot", 0);
|
||||
}
|
||||
else
|
||||
break;
|
||||
}
|
||||
|
||||
if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ())
|
||||
/* Implicit execution of boot, only if something is loaded. */
|
||||
grub_command_execute ("boot", 0);
|
||||
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
{
|
||||
grub_print_error ();
|
||||
|
|
Loading…
Reference in a new issue