pull-in block-arg again
This commit is contained in:
commit
2bcfd8a295
9 changed files with 32 additions and 72 deletions
|
@ -25,7 +25,7 @@
|
|||
|
||||
grub_err_t
|
||||
grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
|
||||
struct grub_script **scripts)
|
||||
struct grub_script *script)
|
||||
{
|
||||
int new_argc;
|
||||
char **new_args;
|
||||
|
@ -38,7 +38,7 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
|
|||
|
||||
context.state = 0;
|
||||
context.extcmd = ext;
|
||||
context.script_params = scripts;
|
||||
context.script = script;
|
||||
|
||||
if (! ext->options)
|
||||
{
|
||||
|
|
|
@ -33,7 +33,7 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
|
|||
grub_err_t r;
|
||||
|
||||
/* XXX Rewrite to make use of already parsed menu definition. */
|
||||
if (! argc || ! ctxt->script_params || ! ctxt->script_params[argc - 1])
|
||||
if (! argc || ! ctxt->script)
|
||||
return GRUB_ERR_BAD_ARGUMENT;
|
||||
|
||||
src = args[argc - 1];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue