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

* grub-core/script/execute.c (grub_script_break): Clarify logic.

Browse source 
Better error handling.
	(grub_script_return): Likewise.
	* grub-core/script/lexer.c (grub_script_lexer_yywrap): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-12 21:33:48 +01:00
parent 77c9182fd2
commit d9a62292e3
3 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,10 +77,18 @@ grub_script_break (grub_command_t cmd, int argc, char *argv[])
if (argc == 0)
count = 1;
else if ((argc > 1) || (count = grub_strtoul (argv[0], &p, 10)) == 0 ||
(*p != '\0'))
return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad break");
else if (argc > 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
else
{
count = grub_strtoul (argv[0], &p, 10);
if (grub_errno)
return grub_errno;
if (*p != '\0')
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("unrecognized number"));
if (count == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("can't break 0 loops"));
}
is_continue = grub_strcmp (cmd->name, "break") ? 1 : 0;
active_breaks = count;
@ -172,11 +180,14 @@ grub_script_return (grub_command_t cmd __attribute__((unused)),
}
n = grub_strtoul (argv[0], &p, 10);
if (grub_errno)
return grub_errno;
if (*p != '\0')
return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad argument");
return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unrecognized number"));
function_return = 1;
return n ? grub_error (GRUB_ERR_TEST_FAILURE, "false") : GRUB_ERR_NONE;
return n ? grub_error (n, N_("false")) : GRUB_ERR_NONE;
}
static int