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

2005-03-08 Yoshinori Okuji <okuji@enbug.org>

Browse source 
Automatic loading of commands is supported.

  * normal/main.c (read_command_list): New function.
  (grub_normal_execute): Call read_command_list.

  * normal/command.c (grub_register_command): Return zero or CMD.
  Allocate CMD->NAME from the heap.
  Initialize CMD->MODULE_NAME to zero.
  Find the same name as well. If the same command is found and it is
  a dummy command, overwrite members. If it is not a dummy command,
  return zero.
  (grub_unregister_command): Free Q->NAME and Q->MODULE_NAME.
  (grub_command_find): If a dummy command is found, load a module
  and retry to find a command only once.

  * normal/cmdline.c (grub_tab_complete): Call grub_command_find to
  make sure that each command is loaded.

  * include/grub/normal.h (GRUB_COMMAND_FLAG_NOT_LOADED): New
  macro.
  (struct grub_command): Remove const from the member `name'.
  Add a new member `module_name'.
  (grub_register_command): Return grub_command_t.

  * commands/help.c (grub_cmd_help): Call grub_command_find to make
  sure that each command is loaded.

  * genmk.rb (PModule::rule): Specify a module name without the
  suffix ".mod" to gencmdlist.sh.
This commit is contained in:
okuji 2005-03-08 01:01:06 +00:00
parent 7b1f4b5715
commit 5822ff87a2
9 changed files with 297 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

43
commands/help.c
View file

@ -40,33 +40,38 @@ grub_cmd_help (struct grub_arg_list *state __attribute__ ((unused)), int argc,
int print_command_info (grub_command_t cmd)
{
if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE)
if (grub_command_find (cmd->name))
{
char description[TERM_WIDTH / 2];
int desclen = grub_strlen (cmd->summary);
/* Make a string with a length of TERM_WIDTH / 2 - 1 filled
with the description followed by spaces. */
grub_memset (description, ' ', TERM_WIDTH / 2 - 1);
description[TERM_WIDTH / 2 - 1] = '\0';
grub_memcpy (description, cmd->summary,
(desclen < TERM_WIDTH / 2 - 1
? desclen : TERM_WIDTH / 2 - 1));
grub_printf ("%s%s", description, (cnt++) % 2 ? "\n" : " ");
if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE)
{
char description[TERM_WIDTH / 2];
int desclen = grub_strlen (cmd->summary);
/* Make a string with a length of TERM_WIDTH / 2 - 1 filled
with the description followed by spaces. */
grub_memset (description, ' ', TERM_WIDTH / 2 - 1);
description[TERM_WIDTH / 2 - 1] = '\0';
grub_memcpy (description, cmd->summary,
(desclen < TERM_WIDTH / 2 - 1
? desclen : TERM_WIDTH / 2 - 1));
grub_printf ("%s%s", description, (cnt++) % 2 ? "\n" : " ");
}
}
return 0;
}
int print_command_help (grub_command_t cmd)
{
if (! grub_strncmp (cmd->name, currarg, grub_strlen (currarg)))
if (grub_command_find (cmd->name))
{
if (cnt++ > 0)
grub_printf ("\n\n");
grub_arg_show_help (cmd);
if (! grub_strncmp (cmd->name, currarg, grub_strlen (currarg)))
{
if (cnt++ > 0)
grub_printf ("\n\n");
grub_arg_show_help (cmd);
}
}
return 0;
}