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

2006-12-11 Marco Gerards <marco@gnu.org>

Browse source 
* 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:
marco_g 2006-12-11 21:00:06 +00:00
parent ef87571464
commit 957b3a3e17
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2006-12-08 Hollis Blanchard <hollis@penguinppc.org>
* kern/powerpc/ieee1275/cmain.c (cmain): Mark r3 and r4 as `UNUSED'. * kern/powerpc/ieee1275/cmain.c (cmain): Mark r3 and r4 as `UNUSED'.

10
normal/menu_entry.c
View file

@ -1007,7 +1007,7 @@ run (struct screen *screen)
/* Execute the script, line for line. */ /* Execute the script, line for line. */
while (currline < screen->num_lines - 1) while (currline < screen->num_lines)
{ {
editor_getline (&nextline); editor_getline (&nextline);
parsed_script = grub_script_parse (nextline, editor_getline); parsed_script = grub_script_parse (nextline, editor_getline);
@ -1018,15 +1018,15 @@ run (struct screen *screen)
/* The parsed script was executed, throw it away. */ /* The parsed script was executed, throw it away. */
grub_script_free (parsed_script); 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 else
break; 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) if (grub_errno != GRUB_ERR_NONE)
{ {
grub_print_error (); grub_print_error ();