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

fix automatic option parsing for dynamic commands

Browse source
This commit is contained in:
BVK Chaitanya 2010-07-19 00:44:21 +05:30
parent 502cddef68
commit 9b65d8c4f5
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
commands/extcmd.c
View file

@ -34,9 +34,20 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
struct grub_extcmd_context context; struct grub_extcmd_context context;
int maxargs = 0; int maxargs = 0;
grub_err_t ret; grub_err_t ret;
grub_extcmd_t ext; grub_extcmd_t ext = cmd->data;
context.state = 0;
context.extcmd = ext;
context.script_params = scripts;
/* Dynamic commands should not perform option parsing before
corresponding module gets loaded. */
if (cmd->flags & GRUB_COMMAND_FLAG_DYNCMD)
{
ret = (ext->func) (&context, argc, args);
return ret;
}
ext = cmd->data;
parser = (struct grub_arg_option *) ext->options; parser = (struct grub_arg_option *) ext->options;
while (parser && (parser++)->doc) while (parser && (parser++)->doc)
maxargs++; maxargs++;
@ -46,10 +57,7 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
if (grub_arg_parse (ext, argc, args, state, &new_args, &new_argc)) if (grub_arg_parse (ext, argc, args, state, &new_args, &new_argc))
{ {
context.extcmd = ext;
context.state = state; context.state = state;
context.script_params = scripts;
ret = (ext->func) (&context, new_argc, new_args); ret = (ext->func) (&context, new_argc, new_args);
grub_free (new_args); grub_free (new_args);
} }