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

Remove grub_commands_iterate

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-26 19:14:24 +01:00
parent e4ff66281a
commit d85da27cc0
3 changed files with 82 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

29
normal/completion.c
View file

@ -176,21 +176,6 @@ iterate_dev (const char *devname)
return 0;
}
static int
iterate_command (grub_command_t cmd)
{
if (cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE)
{
if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE)
{
if (add_completion (cmd->name, " ", GRUB_COMPLETION_TYPE_COMMAND))
return 1;
}
}
return 0;
}
/* Complete a device. */
static int
complete_device (void)
@ -421,8 +406,18 @@ grub_normal_do_completion (char *buf, int *restore,
if (argc == 1 || argc == 0)
{
/* Complete a command. */
if (grub_command_iterate (iterate_command))
goto fail;
grub_command_t cmd;
FOR_COMMANDS(cmd)
{
if (cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE)
{
if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE)
{
if (add_completion (cmd->name, " ", GRUB_COMPLETION_TYPE_COMMAND))
goto fail;
}
}
}
}
else if (*current_word == '-')
{