2005-03-08 Yoshinori Okuji <okuji@enbug.org>
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:
parent
7b1f4b5715
commit
5822ff87a2
9 changed files with 297 additions and 115 deletions
|
@ -273,8 +273,12 @@ grub_tab_complete (char *buf, int *restore)
|
|||
|
||||
int iterate_commands (grub_command_t cmd)
|
||||
{
|
||||
if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE)
|
||||
add_completion (cmd->name, " ", "commands", print_simple_completion);
|
||||
if (grub_command_find (cmd->name))
|
||||
{
|
||||
if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE)
|
||||
add_completion (cmd->name, " ", "commands",
|
||||
print_simple_completion);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
static grub_command_t grub_command_list;
|
||||
|
||||
void
|
||||
grub_command_t
|
||||
grub_register_command (const char *name,
|
||||
grub_err_t (*func) (struct grub_arg_list *state,
|
||||
int argc, char **args),
|
||||
|
@ -40,27 +40,63 @@ grub_register_command (const char *name,
|
|||
|
||||
cmd = (grub_command_t) grub_malloc (sizeof (*cmd));
|
||||
if (! cmd)
|
||||
return;
|
||||
return 0;
|
||||
|
||||
cmd->name = name;
|
||||
cmd->name = grub_strdup (name);
|
||||
if (! cmd->name)
|
||||
{
|
||||
grub_free (cmd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
cmd->func = func;
|
||||
cmd->flags = flags;
|
||||
cmd->summary = summary;
|
||||
cmd->description = description;
|
||||
cmd->options = options;
|
||||
cmd->module_name = 0;
|
||||
|
||||
/* Keep the list sorted for simplicity. */
|
||||
p = &grub_command_list;
|
||||
while (*p)
|
||||
{
|
||||
if (grub_strcmp ((*p)->name, name) > 0)
|
||||
if (grub_strcmp ((*p)->name, name) >= 0)
|
||||
break;
|
||||
|
||||
p = &((*p)->next);
|
||||
}
|
||||
|
||||
cmd->next = *p;
|
||||
*p = cmd;
|
||||
if (*p && grub_strcmp ((*p)->name, name) == 0)
|
||||
{
|
||||
grub_command_t q;
|
||||
|
||||
q = *p;
|
||||
if (q->flags & GRUB_COMMAND_FLAG_NOT_LOADED)
|
||||
{
|
||||
q->func = cmd->func;
|
||||
q->flags = cmd->flags;
|
||||
q->summary = cmd->summary;
|
||||
q->description = cmd->description;
|
||||
q->options = cmd->options;
|
||||
grub_free (cmd->name);
|
||||
grub_free (cmd->module_name);
|
||||
grub_free (cmd);
|
||||
cmd = q;
|
||||
}
|
||||
else
|
||||
{
|
||||
grub_free (cmd->name);
|
||||
grub_free (cmd);
|
||||
cmd = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
cmd->next = *p;
|
||||
*p = cmd;
|
||||
}
|
||||
|
||||
return cmd;
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -72,6 +108,8 @@ grub_unregister_command (const char *name)
|
|||
if (grub_strcmp (name, q->name) == 0)
|
||||
{
|
||||
*p = q->next;
|
||||
grub_free (q->name);
|
||||
grub_free (q->module_name);
|
||||
grub_free (q);
|
||||
break;
|
||||
}
|
||||
|
@ -82,17 +120,48 @@ grub_command_find (char *cmdline)
|
|||
{
|
||||
char *first_space;
|
||||
grub_command_t cmd;
|
||||
|
||||
int count = 0;
|
||||
|
||||
first_space = grub_strchr (cmdline, ' ');
|
||||
if (first_space)
|
||||
*first_space = '\0';
|
||||
|
||||
again:
|
||||
|
||||
for (cmd = grub_command_list; cmd; cmd = cmd->next)
|
||||
if (grub_strcmp (cmdline, cmd->name) == 0)
|
||||
break;
|
||||
|
||||
if (! cmd)
|
||||
grub_error (GRUB_ERR_UNKNOWN_COMMAND, "unknown command `%s'", cmdline);
|
||||
else if (cmd->flags & GRUB_COMMAND_FLAG_NOT_LOADED)
|
||||
{
|
||||
/* Automatically load the command. */
|
||||
if (count == 0)
|
||||
{
|
||||
grub_dl_t mod;
|
||||
char *module_name;
|
||||
|
||||
module_name = grub_strdup (cmd->module_name);
|
||||
if (module_name)
|
||||
{
|
||||
mod = grub_dl_load (module_name);
|
||||
if (mod)
|
||||
{
|
||||
grub_dl_ref (mod);
|
||||
count++;
|
||||
goto again;
|
||||
}
|
||||
|
||||
grub_free (module_name);
|
||||
}
|
||||
}
|
||||
|
||||
/* This module seems broken. */
|
||||
grub_unregister_command (cmdline);
|
||||
grub_error (GRUB_ERR_UNKNOWN_COMMAND, "unknown command `%s'", cmdline);
|
||||
cmd = 0;
|
||||
}
|
||||
|
||||
if (first_space)
|
||||
*first_space = ' ';
|
||||
|
|
|
@ -304,6 +304,69 @@ grub_normal_init_page (void)
|
|||
PACKAGE_VERSION);
|
||||
}
|
||||
|
||||
/* Read the file command.lst for auto-loading. */
|
||||
static void
|
||||
read_command_list (void)
|
||||
{
|
||||
const char *prefix;
|
||||
|
||||
prefix = grub_env_get ("prefix");
|
||||
if (prefix)
|
||||
{
|
||||
char *filename;
|
||||
|
||||
filename = grub_malloc (grub_strlen (prefix) + sizeof ("/command.lst"));
|
||||
if (filename)
|
||||
{
|
||||
grub_file_t file;
|
||||
|
||||
grub_sprintf (filename, "%s/command.lst", prefix);
|
||||
file = grub_file_open (filename);
|
||||
if (file)
|
||||
{
|
||||
char buf[80]; /* XXX arbitrary */
|
||||
|
||||
while (get_line (file, buf, sizeof (buf)))
|
||||
{
|
||||
char *p;
|
||||
grub_command_t cmd;
|
||||
|
||||
if (! grub_isgraph (buf[0]))
|
||||
continue;
|
||||
|
||||
p = grub_strchr (buf, ':');
|
||||
if (! p)
|
||||
continue;
|
||||
|
||||
*p = '\0';
|
||||
while (*++p == ' ')
|
||||
;
|
||||
|
||||
if (! grub_isgraph (*p))
|
||||
continue;
|
||||
|
||||
cmd = grub_register_command (buf, 0,
|
||||
GRUB_COMMAND_FLAG_NOT_LOADED,
|
||||
0, 0, 0);
|
||||
if (! cmd)
|
||||
continue;
|
||||
|
||||
cmd->module_name = grub_strdup (p);
|
||||
if (! cmd->module_name)
|
||||
grub_unregister_command (buf);
|
||||
}
|
||||
|
||||
grub_file_close (file);
|
||||
}
|
||||
|
||||
grub_free (filename);
|
||||
}
|
||||
}
|
||||
|
||||
/* Ignore errors. */
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
/* Read the config file CONFIG and execute the menu interface or
|
||||
the command-line interface. */
|
||||
void
|
||||
|
@ -319,6 +382,8 @@ grub_normal_execute (const char *config, int nested)
|
|||
grub_errno = GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
read_command_list ();
|
||||
|
||||
if (menu)
|
||||
{
|
||||
grub_menu_run (menu, nested);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue