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

continue command support

Browse source
This commit is contained in:
BVK Chaitanya 2010-05-05 16:19:31 +05:30
parent 160bb3d885
commit eee2594104
4 changed files with 106 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
script/execute.c
View file

@ -30,13 +30,13 @@
is sizeof (int) * 3, and one extra for a possible -ve sign. */
#define ERRNO_DIGITS_MAX (sizeof (int) * 3 + 1)
static unsigned long is_continue;
static unsigned long active_loops;
static unsigned long active_breaks;
static struct grub_script_scope *scope = 0;
grub_err_t
grub_script_break (grub_command_t cmd __attribute__((unused)),
int argc, char *argv[])
grub_script_break (grub_command_t cmd, int argc, char *argv[])
{
char *p = 0;
unsigned long count;
@ -50,6 +50,8 @@ grub_script_break (grub_command_t cmd __attribute__((unused)),
return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad break");
active_breaks = count;
is_continue = grub_strcmp (cmd->name, "break") ? 1 : 0;
return GRUB_ERR_NONE;
}
@ -408,6 +410,9 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
result = 0;
for (i = 0; i < argcount; i++)
{
if (is_continue && active_breaks == 1)
active_breaks = 0;
if (! active_breaks)
{
grub_script_env_set (cmdfor->name->str, args[i]);
@ -441,14 +446,17 @@ grub_script_execute_cmdwhile (struct grub_script_cmd *cmd)
result = grub_script_execute_cmd (cmdwhile->list);
if (active_breaks == 1 && is_continue)
active_breaks = 0;
if (active_breaks)
{
active_breaks--;
break;
}
break;
} while (1); /* XXX Put a check for ^C here */
if (active_breaks)
active_breaks--;
active_loops--;
return result;
}

2
script/main.c
View file

@ -52,6 +52,8 @@ GRUB_MOD_INIT(sh)
grub_parser_register ("grub", &grub_sh_parser);
grub_register_command ("break", grub_script_break,
N_("[n]"), N_("Exit from loops"));
grub_register_command ("continue", grub_script_break,
N_("[n]"), N_("Continue loops"));
}
GRUB_MOD_FINI(sh)