2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove <grub/normal.h> and <grub/arg.h>. (grub_cmd_blocklist): Use the new command interface. (GRUB_MOD_INIT): Likewise. (GRUB_MOD_FINI): Likewise. * commands/boot.c: Likewise. * commands/cat.c: Likewise. * commands/cmp.c: Likewise. * commands/configfile.c: Likewise. * commands/crc.c: Likewise. * commands/echo.c: Likewise. * commands/halt.c: Likewise. * commands/handler.c: Likewise. * commands/hdparm.c: Likewise. * commands/help.c: Likewise. * commands/hexdump.c: Likewise. * commands/loadenv.c: Likewise. * commands/ls.c: Likewise. * commands/lsmmap.c: Likewise. * commands/lspci.c: Likewise. * commands/loadenv.c: Likewise. * commands/read.c: Likewise. * commands/reboot.c: Likewise. * commands/search.c: Likewise. * commands/sleep.c: Likewise. * commands/test.c: Likewise. * commands/usbtest.c: Likewise. * commands/videotest.c: Likewise. * commands/i386/cpuid.c: Likewise. * commands/i386/pc/halt.c: Likewise. * commands/i386/pc/play.c: Likewise. * commands/i386/pc/pxecmd.c: Likewise. * commands/i386/pc/vbeinfo.c: Likewise. * commands/i386/pc/vbetest.c: Likewise. * commands/ieee1275/suspend.c: Likewise. * disk/loopback.c: Likewise. * font/font_cmd.c: Likewise. * hello/hello.c: Likewise. * loader/efi/appleloader.c: Likewise. * loader/efi/chainloader.c: Likewise. * loader/i386/bsd.c: Likewise. * loader/i386/efi/linux.c: Likewise. * loader/i386/ieee1275/linux.c: Likewise. * loader/i386/linux.c: Likewise. * loader/i386/pc/chainloader.c: Likewise. * loader/i386/pc/linux.c: Likewise. * loader/powerpc/ieee1275/linux.c: Likewise. * loader/multiboot_loader.c: Likewise. * term/gfxterm.c: Likewise. * term/i386/pc/serial.c: Likewise. * term/terminfo.c: Likewise. * term/i386/pc/vesafb.c: Removed <grub/arg.h>. * term/i386/pc/vga.c: Likewise. * video/readers/jpeg.c: Likewise. * video/readers/png.c: Likewise. * video/readers/tga.c: Likewise. * util/grub-fstest (cmd_loopback): Removed. (cmd_blocklist): Likewise. (cmd_ls): Likewise. (grub_register_command): Likewise. (grub_unregister_command): Likewise. (execute_command): Use grub_command_find to locate command and execute it. * include/grub/efi/chainloader.h: Removed. * loader/efi/chainloader_normal.c: Likewise. * loader/i386/bsd_normal.c: Likewise. * loader/i386/pc/chainloader_normal.c: Likewise. * loader/i386/pc/multiboot_normal.c: Likewise. * loader/linux_normal.c: Likewise. * loader/multiboot_loader_normal.c: Likewise. * loader/powerpc/ieee1275/linux_normal.c: Likewise. * gencmdlist.sh: Scan new registration command grub_register_extcmd and grub_register_command_p1. * conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c, kern/command.c, lib/arg.c and commands/extcmd.c. (pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod. (minicmd_mod_SOURCES): New variable. (minicmd_mod_CFLAGS): Likewise. (minicmd_mod_LDFLAGS): Likewise. (extcmd_mod_SOURCES): Likewise. (extcmd_mod_CFLAGS): Likewise. (extcmd_mod_LDFLAGS): Likewise. (boot_mod_SOURCES): Removed. (boot_mod_CFLAGS): Likewise. (boot_mod_LDFLAGS): Likewise. * conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and kern/corecmd.c. (kernel_img_HEADERS): Add command.h. (grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c and lib/arg.c. (pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and _multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod, remove the corresponding normal mode command. (normal_mod_SOURCES): Remove normal/arg.c. * conf/i386-coreboot.rmk: Likewise. * conf/i386-efi.rmk: Likewise. * conf/i386-ieee1275.rmk: Likewise. * conf/powerpc-ieee1275.rmk: Likewise. * conf/x86_64-efi.rmk: Likewise. * include/grub/arg.h: Move from here ... * include/grub/lib/arg.h: ... to here. * normal/arg.c: Move from here ... * lib/arg.c: ... to here. * commands/extcmd.c: New file. * commands/minicmd.c: Likewise. * include/grub/command.h: Likewise. * include/grub/extcmd.h: Likewise. * kern/command.c: Likewise. * kern/corecmd.c: Likewise. * kern/list.c (grub_list_iterate): Return int instead of void. (grub_list_insert): New function. (grub_prio_list_insert): Likewise. * kern/rescue.c (grub_rescue_command): Removed. (grub_rescue_command_list): Likewise. (grub_rescue_register_command): Likewise. (grub_rescue_unregister_command): Likewise. (grub_rescue_cmd_boot): Move to minicmd.c (grub_rescue_cmd_help): Likewise. (grub_rescue_cmd_info): Likewise. (grub_rescue_cmd_boot): Likewise. (grub_rescue_cmd_testload): Likewise. (grub_rescue_cmd_dump): Likewise. (grub_rescue_cmd_rmmod): Likewise. (grub_rescue_cmd_lsmod): Likewise. (grub_rescue_cmd_exit): Likewise. (grub_rescue_print_devices): Moved to corecmd.c. (grub_rescue_print_files): Likewise. (grub_rescue_cmd_ls): Likewise. (grub_rescue_cmd_insmod): Likewise. (grub_rescue_cmd_set): Likewise. (grub_rescue_cmd_unset): Likewise. (attemp_normal_mode): Use grub_command_find to get normal module. (grub_enter_rescue_mode): Use grub_register_core_commands to register commands, remove grub_rescue_regiter_command calls. * normal/command.c (grub_regiser_command): Removed. (grub_unregister_command): Likewise. (grub_command_find): Likewise. (grub_iterate_commands): Likewise. (rescue_command): Likewise. (export_command): Moved to corecmd.c. (set_command): Removed. (unset_command): Likewise. (insmod_command): Likewise. (rmmod_command): Likewise. (lsmod_command): Likewise. (grub_command_init): Likewise. * normal/completion.c (iterate_command): Use cmd->prio to check for active command. (complete_arguments): Use grub_extcmd_t structure to find options. (grub_normal_do_completion): Change function grub_iterate_commands to grub_command_iterate. * normal/execute.c (grub_script_execute_cmd): No need to parse argument here. * normal/main.c (grub_dyncmd_dispatcher): New function. (read_command_list): Register unload commands as dyncmd. (grub_cmd_normal): Use new command interface, register rescue, unregister normal at entry, register normal, unregister rescue at exit. * include/grub/list.h (grub_list_test_t): New type. (grub_list_iterate): Return int instead of void. (grub_list_insert): New function. (GRUB_AS_NAMED_LIST_P): New macro. (GRUB_AS_PRIO_LIST): Likewise. (GRUB_AS_PRIO_LIST_P): Likewise. (GRUB_PRIO_LIST_PRIO_MASK): New constant. (GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise. (grub_prio_list): New structure. (grub_prio_list_insert): New function. (grub_prio_list_remove): New inline function. * include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>. (GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h. (GRUB_COMMAND_FLAG_MENU): Likewise. (GRUB_COMMAND_FLAG_BOTH): Likewise. (GRUB_COMMAND_FLAG_TITLE): Likewise. (GRUB_COMMAND_FLAG_NO_ECHO): Likewise. (GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed. (GRUB_COMMAND_FLAG_NOT_LOADED): Likewise. (grub_command): Likewise. (grub_register_command): Likewise. (grub_command_find): Likewise. (grub_iterate_commands): Likewise. (grub_command_init): Likewise. (grub_arg_parse): Likewise. (grub_arg_show_help): Likewise. * include/grub/rescue.h (grub_rescue_register_command): Removed. (grub_rescue_unregister_command): Likewise. * include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd, grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd, grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module. * include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and grub_rescue_cmd_initrd. * include/grub/i386/loader.h: Likewise. * include/grub/x86_64/loader.h: Likewise. * include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
This commit is contained in:
bean
parent
1f4147aaf0
commit
b1b797cb1b
100 changed files with 3058 additions and 3914 deletions
419
normal/arg.c
419
normal/arg.c
|
|
@ -1,419 +0,0 @@
|
|||
/* arg.c - argument parser */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2003,2004,2005,2007,2008 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/arg.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/err.h>
|
||||
#include <grub/normal.h>
|
||||
#include <grub/term.h>
|
||||
|
||||
/* Built-in parser for default options. */
|
||||
#define SHORT_ARG_HELP -100
|
||||
#define SHORT_ARG_USAGE -101
|
||||
|
||||
static const struct grub_arg_option help_options[] =
|
||||
{
|
||||
{"help", SHORT_ARG_HELP, 0,
|
||||
"display this help and exit", 0, ARG_TYPE_NONE},
|
||||
{"usage", SHORT_ARG_USAGE, 0,
|
||||
"display the usage of this command and exit", 0, ARG_TYPE_NONE},
|
||||
{0, 0, 0, 0, 0, 0}
|
||||
};
|
||||
|
||||
static struct grub_arg_option *
|
||||
find_short (const struct grub_arg_option *options, char c)
|
||||
{
|
||||
struct grub_arg_option *found = 0;
|
||||
auto struct grub_arg_option *fnd_short (const struct grub_arg_option *opt);
|
||||
|
||||
struct grub_arg_option *fnd_short (const struct grub_arg_option *opt)
|
||||
{
|
||||
while (opt->doc)
|
||||
{
|
||||
if (opt->shortarg == c)
|
||||
return (struct grub_arg_option *) opt;
|
||||
opt++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (options)
|
||||
found = fnd_short (options);
|
||||
|
||||
if (! found)
|
||||
{
|
||||
switch (c)
|
||||
{
|
||||
case 'h':
|
||||
found = (struct grub_arg_option *) help_options;
|
||||
break;
|
||||
|
||||
case 'u':
|
||||
found = (struct grub_arg_option *) (help_options + 1);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return found;
|
||||
}
|
||||
|
||||
static char *
|
||||
find_long_option (char *s)
|
||||
{
|
||||
char *argpos = grub_strchr (s, '=');
|
||||
|
||||
if (argpos)
|
||||
{
|
||||
*argpos = '\0';
|
||||
return ++argpos;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct grub_arg_option *
|
||||
find_long (const struct grub_arg_option *options, char *s)
|
||||
{
|
||||
struct grub_arg_option *found = 0;
|
||||
auto struct grub_arg_option *fnd_long (const struct grub_arg_option *opt);
|
||||
|
||||
struct grub_arg_option *fnd_long (const struct grub_arg_option *opt)
|
||||
{
|
||||
while (opt->doc)
|
||||
{
|
||||
if (opt->longarg && ! grub_strcmp (opt->longarg, s))
|
||||
return (struct grub_arg_option *) opt;
|
||||
opt++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (options)
|
||||
found = fnd_long (options);
|
||||
|
||||
if (! found)
|
||||
found = fnd_long (help_options);
|
||||
|
||||
return found;
|
||||
}
|
||||
|
||||
static void
|
||||
show_usage (grub_command_t cmd)
|
||||
{
|
||||
grub_printf ("Usage: %s\n", cmd->summary);
|
||||
}
|
||||
|
||||
void
|
||||
grub_arg_show_help (grub_command_t cmd)
|
||||
{
|
||||
auto void showargs (const struct grub_arg_option *opt);
|
||||
int h_is_used = 0;
|
||||
int u_is_used = 0;
|
||||
|
||||
auto void showargs (const struct grub_arg_option *opt)
|
||||
{
|
||||
for (; opt->doc; opt++)
|
||||
{
|
||||
int spacing = 20;
|
||||
|
||||
if (opt->shortarg && grub_isgraph (opt->shortarg))
|
||||
grub_printf ("-%c%c ", opt->shortarg, opt->longarg ? ',':' ');
|
||||
else if (opt->shortarg == SHORT_ARG_HELP && ! h_is_used)
|
||||
grub_printf ("-h, ");
|
||||
else if (opt->shortarg == SHORT_ARG_USAGE && ! u_is_used)
|
||||
grub_printf ("-u, ");
|
||||
else
|
||||
grub_printf (" ");
|
||||
|
||||
if (opt->longarg)
|
||||
{
|
||||
grub_printf ("--%s", opt->longarg);
|
||||
spacing -= grub_strlen (opt->longarg) + 2;
|
||||
|
||||
if (opt->arg)
|
||||
{
|
||||
grub_printf ("=%s", opt->arg);
|
||||
spacing -= grub_strlen (opt->arg) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
const char *doc = opt->doc;
|
||||
for (;;)
|
||||
{
|
||||
while (spacing-- > 0)
|
||||
grub_putchar (' ');
|
||||
|
||||
while (*doc && *doc != '\n')
|
||||
grub_putchar (*doc++);
|
||||
grub_putchar ('\n');
|
||||
|
||||
if (! *doc)
|
||||
break;
|
||||
doc++;
|
||||
spacing = 4 + 20;
|
||||
}
|
||||
|
||||
switch (opt->shortarg)
|
||||
{
|
||||
case 'h':
|
||||
h_is_used = 1;
|
||||
break;
|
||||
|
||||
case 'u':
|
||||
u_is_used = 1;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
show_usage (cmd);
|
||||
grub_printf ("%s\n\n", cmd->description);
|
||||
if (cmd->options)
|
||||
showargs (cmd->options);
|
||||
showargs (help_options);
|
||||
#if 0
|
||||
grub_printf ("\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
parse_option (grub_command_t cmd, int key, char *arg, struct grub_arg_list *usr)
|
||||
{
|
||||
switch (key)
|
||||
{
|
||||
case SHORT_ARG_HELP:
|
||||
grub_arg_show_help (cmd);
|
||||
return -1;
|
||||
|
||||
case SHORT_ARG_USAGE:
|
||||
show_usage (cmd);
|
||||
return -1;
|
||||
|
||||
default:
|
||||
{
|
||||
int found = -1;
|
||||
int i = 0;
|
||||
const struct grub_arg_option *opt = cmd->options;
|
||||
|
||||
while (opt->doc)
|
||||
{
|
||||
if (opt->shortarg && key == opt->shortarg)
|
||||
{
|
||||
found = i;
|
||||
break;
|
||||
}
|
||||
opt++;
|
||||
i++;
|
||||
}
|
||||
|
||||
if (found == -1)
|
||||
return -1;
|
||||
|
||||
usr[found].set = 1;
|
||||
usr[found].arg = arg;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
grub_arg_parse (grub_command_t cmd, int argc, char **argv,
|
||||
struct grub_arg_list *usr, char ***args, int *argnum)
|
||||
{
|
||||
int curarg;
|
||||
char *longarg = 0;
|
||||
int complete = 0;
|
||||
char **argl = 0;
|
||||
int num = 0;
|
||||
auto grub_err_t add_arg (char *s);
|
||||
|
||||
grub_err_t add_arg (char *s)
|
||||
{
|
||||
argl = grub_realloc (argl, (++num) * sizeof (char *));
|
||||
if (! argl)
|
||||
return grub_errno;
|
||||
argl[num - 1] = s;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
for (curarg = 0; curarg < argc; curarg++)
|
||||
{
|
||||
char *arg = argv[curarg];
|
||||
struct grub_arg_option *opt;
|
||||
char *option = 0;
|
||||
|
||||
/* No option is used. */
|
||||
if (arg[0] != '-' || grub_strlen (arg) == 1)
|
||||
{
|
||||
if (add_arg (arg) != 0)
|
||||
goto fail;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
/* One or more short options. */
|
||||
if (arg[1] != '-')
|
||||
{
|
||||
char *curshort = arg + 1;
|
||||
|
||||
while (1)
|
||||
{
|
||||
opt = find_short (cmd->options, *curshort);
|
||||
if (! opt)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"Unknown argument `-%c'\n", *curshort);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
curshort++;
|
||||
|
||||
/* Parse all arguments here except the last one because
|
||||
it can have an argument value. */
|
||||
if (*curshort)
|
||||
{
|
||||
if (parse_option (cmd, opt->shortarg, 0, usr) || grub_errno)
|
||||
goto fail;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (opt->type != ARG_TYPE_NONE)
|
||||
{
|
||||
if (curarg + 1 < argc)
|
||||
{
|
||||
char *nextarg = argv[curarg + 1];
|
||||
if (!(opt->flags & GRUB_ARG_OPTION_OPTIONAL)
|
||||
|| (grub_strlen (nextarg) < 2 || nextarg[0] != '-'))
|
||||
option = argv[++curarg];
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else /* The argument starts with "--". */
|
||||
{
|
||||
/* If the argument "--" is used just pass the other
|
||||
arguments. */
|
||||
if (grub_strlen (arg) == 2)
|
||||
{
|
||||
for (curarg++; curarg < argc; curarg++)
|
||||
if (add_arg (argv[curarg]) != 0)
|
||||
goto fail;
|
||||
break;
|
||||
}
|
||||
|
||||
longarg = (char *) grub_strdup (arg);
|
||||
if (! longarg)
|
||||
goto fail;
|
||||
|
||||
option = find_long_option (longarg);
|
||||
arg = longarg;
|
||||
|
||||
opt = find_long (cmd->options, arg + 2);
|
||||
if (! opt)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT, "Unknown argument `%s'\n", arg);
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
if (! (opt->type == ARG_TYPE_NONE
|
||||
|| (! option && (opt->flags & GRUB_ARG_OPTION_OPTIONAL))))
|
||||
{
|
||||
if (! option)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"Missing mandatory option for `%s'\n", opt->longarg);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
switch (opt->type)
|
||||
{
|
||||
case ARG_TYPE_NONE:
|
||||
/* This will never happen. */
|
||||
break;
|
||||
|
||||
case ARG_TYPE_STRING:
|
||||
/* No need to do anything. */
|
||||
break;
|
||||
|
||||
case ARG_TYPE_INT:
|
||||
{
|
||||
char *tail;
|
||||
|
||||
grub_strtoul (option, &tail, 0);
|
||||
if (tail == 0 || tail == option || *tail != '\0' || grub_errno)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"The argument `%s' requires an integer.",
|
||||
arg);
|
||||
|
||||
goto fail;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case ARG_TYPE_DEVICE:
|
||||
case ARG_TYPE_DIR:
|
||||
case ARG_TYPE_FILE:
|
||||
case ARG_TYPE_PATHNAME:
|
||||
/* XXX: Not implemented. */
|
||||
break;
|
||||
}
|
||||
if (parse_option (cmd, opt->shortarg, option, usr) || grub_errno)
|
||||
goto fail;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (option)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"A value was assigned to the argument `%s' while it "
|
||||
"doesn't require an argument\n", arg);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (parse_option (cmd, opt->shortarg, 0, usr) || grub_errno)
|
||||
goto fail;
|
||||
}
|
||||
grub_free (longarg);
|
||||
longarg = 0;
|
||||
}
|
||||
|
||||
complete = 1;
|
||||
|
||||
*args = argl;
|
||||
*argnum = num;
|
||||
|
||||
fail:
|
||||
grub_free (longarg);
|
||||
|
||||
return complete;
|
||||
}
|
||||
330
normal/command.c
330
normal/command.c
|
|
@ -25,163 +25,8 @@
|
|||
#include <grub/dl.h>
|
||||
#include <grub/parser.h>
|
||||
#include <grub/script.h>
|
||||
|
||||
static grub_command_t grub_command_list;
|
||||
|
||||
grub_command_t
|
||||
grub_register_command (const char *name,
|
||||
grub_err_t (*func) (struct grub_arg_list *state,
|
||||
int argc, char **args),
|
||||
unsigned flags,
|
||||
const char *summary,
|
||||
const char *description,
|
||||
const struct grub_arg_option *options)
|
||||
{
|
||||
grub_command_t cmd, *p;
|
||||
|
||||
cmd = (grub_command_t) grub_malloc (sizeof (*cmd));
|
||||
if (! cmd)
|
||||
return 0;
|
||||
|
||||
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)
|
||||
break;
|
||||
|
||||
p = &((*p)->next);
|
||||
}
|
||||
|
||||
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
|
||||
grub_unregister_command (const char *name)
|
||||
{
|
||||
grub_command_t *p, q;
|
||||
|
||||
for (p = &grub_command_list, q = *p; q; p = &(q->next), q = q->next)
|
||||
if (grub_strcmp (name, q->name) == 0)
|
||||
{
|
||||
*p = q->next;
|
||||
grub_free (q->name);
|
||||
grub_free (q->module_name);
|
||||
grub_free (q);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
grub_command_t
|
||||
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++;
|
||||
grub_free (module_name);
|
||||
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 = ' ';
|
||||
|
||||
return cmd;
|
||||
}
|
||||
|
||||
int
|
||||
grub_iterate_commands (int (*iterate) (grub_command_t))
|
||||
{
|
||||
grub_command_t cmd;
|
||||
|
||||
for (cmd = grub_command_list; cmd; cmd = cmd->next)
|
||||
if (iterate (cmd))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
#include <grub/list.h>
|
||||
#include <grub/command.h>
|
||||
|
||||
int
|
||||
grub_command_execute (char *cmdline, int interactive)
|
||||
|
|
@ -222,173 +67,4 @@ grub_command_execute (char *cmdline, int interactive)
|
|||
grub_set_more (0);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
rescue_command (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc __attribute__ ((unused)),
|
||||
char **args __attribute__ ((unused)))
|
||||
{
|
||||
grub_longjmp (grub_exit_env, 0);
|
||||
|
||||
/* Never reach here. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static grub_err_t
|
||||
set_command (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
char *var;
|
||||
char *val;
|
||||
|
||||
auto int print_env (struct grub_env_var *env);
|
||||
int print_env (struct grub_env_var *env)
|
||||
{
|
||||
grub_printf ("%s=%s\n", env->name, env->value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (! argc)
|
||||
{
|
||||
grub_env_iterate (print_env);
|
||||
return 0;
|
||||
}
|
||||
|
||||
var = args[0];
|
||||
val = grub_strchr (var, '=');
|
||||
if (! val)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT, "not an assignment");
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
val[0] = 0;
|
||||
grub_env_set (var, val + 1);
|
||||
val[0] = '=';
|
||||
return 0;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
unset_command (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
if (argc < 1)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"no environment variable specified");
|
||||
|
||||
grub_env_unset (args[0]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
export_command (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
if (argc < 1)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"no environment variable specified");
|
||||
|
||||
grub_env_export (args[0]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
insmod_command (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
char *p;
|
||||
grub_dl_t mod;
|
||||
|
||||
if (argc == 0)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no module specified");
|
||||
|
||||
p = grub_strchr (args[0], '/');
|
||||
if (! p)
|
||||
mod = grub_dl_load (args[0]);
|
||||
else
|
||||
mod = grub_dl_load_file (args[0]);
|
||||
|
||||
if (mod)
|
||||
grub_dl_ref (mod);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
rmmod_command (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc, char **args)
|
||||
{
|
||||
grub_dl_t mod;
|
||||
|
||||
if (argc == 0)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no module specified");
|
||||
|
||||
mod = grub_dl_get (args[0]);
|
||||
if (! mod)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no such module");
|
||||
|
||||
if (! grub_dl_unref (mod))
|
||||
grub_dl_unload (mod);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
lsmod_command (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc __attribute__ ((unused)),
|
||||
char **args __attribute__ ((unused)))
|
||||
{
|
||||
auto int print_module (grub_dl_t mod);
|
||||
|
||||
int print_module (grub_dl_t mod)
|
||||
{
|
||||
grub_dl_dep_t dep;
|
||||
|
||||
grub_printf ("%s\t%d\t\t", mod->name, mod->ref_count);
|
||||
for (dep = mod->dep; dep; dep = dep->next)
|
||||
{
|
||||
if (dep != mod->dep)
|
||||
grub_putchar (',');
|
||||
|
||||
grub_printf ("%s", dep->mod->name);
|
||||
}
|
||||
grub_putchar ('\n');
|
||||
grub_refresh ();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
grub_printf ("Name\tRef Count\tDependencies\n");
|
||||
grub_dl_iterate (print_module);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
grub_command_init (void)
|
||||
{
|
||||
grub_register_command ("rescue", rescue_command, GRUB_COMMAND_FLAG_BOTH,
|
||||
"rescue", "Go back to the rescue mode.", 0);
|
||||
|
||||
grub_register_command ("set", set_command, GRUB_COMMAND_FLAG_BOTH,
|
||||
"set [ENVVAR=VALUE]",
|
||||
"Set an environment variable.", 0);
|
||||
|
||||
grub_register_command ("unset", unset_command, GRUB_COMMAND_FLAG_BOTH,
|
||||
"unset ENVVAR", "Remove an environment variable.", 0);
|
||||
|
||||
grub_register_command ("export", export_command, GRUB_COMMAND_FLAG_BOTH,
|
||||
"export ENVVAR", "Export a variable.", 0);
|
||||
|
||||
grub_register_command ("insmod", insmod_command, GRUB_COMMAND_FLAG_BOTH,
|
||||
"insmod MODULE",
|
||||
"Insert a module. The argument can be a file or a module name.",
|
||||
0);
|
||||
|
||||
grub_register_command ("rmmod", rmmod_command, GRUB_COMMAND_FLAG_BOTH,
|
||||
"rmmod MODULE", "Remove a module.", 0);
|
||||
|
||||
grub_register_command ("lsmod", lsmod_command, GRUB_COMMAND_FLAG_BOTH,
|
||||
"lsmod", "Show loaded modules.", 0);
|
||||
}
|
||||
}
|
||||
|
|
@ -25,6 +25,7 @@
|
|||
#include <grub/disk.h>
|
||||
#include <grub/file.h>
|
||||
#include <grub/parser.h>
|
||||
#include <grub/extcmd.h>
|
||||
|
||||
/* The current word. */
|
||||
static char *current_word;
|
||||
|
|
@ -179,7 +180,7 @@ iterate_dev (const char *devname)
|
|||
static int
|
||||
iterate_command (grub_command_t cmd)
|
||||
{
|
||||
if (grub_command_find (cmd->name))
|
||||
if (cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE)
|
||||
{
|
||||
if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE)
|
||||
{
|
||||
|
|
@ -318,19 +319,24 @@ static int
|
|||
complete_arguments (char *command)
|
||||
{
|
||||
grub_command_t cmd;
|
||||
grub_extcmd_t ext;
|
||||
const struct grub_arg_option *option;
|
||||
char shortarg[] = "- ";
|
||||
|
||||
cmd = grub_command_find (command);
|
||||
|
||||
if (!cmd || !cmd->options)
|
||||
if (!cmd || !(cmd->flags & GRUB_COMMAND_FLAG_EXTCMD))
|
||||
return 0;
|
||||
|
||||
ext = cmd->data;
|
||||
if (!ext->options)
|
||||
return 0;
|
||||
|
||||
if (add_completion ("-u", " ", GRUB_COMPLETION_TYPE_ARGUMENT))
|
||||
return 1;
|
||||
|
||||
/* Add the short arguments. */
|
||||
for (option = cmd->options; option->doc; option++)
|
||||
for (option = ext->options; option->doc; option++)
|
||||
{
|
||||
if (! option->shortarg)
|
||||
continue;
|
||||
|
|
@ -348,7 +354,7 @@ complete_arguments (char *command)
|
|||
return 1;
|
||||
|
||||
/* Add the long arguments. */
|
||||
for (option = cmd->options; option->doc; option++)
|
||||
for (option = ext->options; option->doc; option++)
|
||||
{
|
||||
char *longarg;
|
||||
if (!option->longarg)
|
||||
|
|
@ -412,7 +418,7 @@ grub_normal_do_completion (char *buf, int *restore,
|
|||
if (argc == 0)
|
||||
{
|
||||
/* Complete a command. */
|
||||
if (grub_iterate_commands (iterate_command))
|
||||
if (grub_command_iterate (iterate_command))
|
||||
goto fail;
|
||||
}
|
||||
else if (*current_word == '-')
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
#include <grub/misc.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/normal.h>
|
||||
#include <grub/arg.h>
|
||||
#include <grub/env.h>
|
||||
#include <grub/script.h>
|
||||
#include <grub/lib/arg.h>
|
||||
|
||||
static grub_err_t
|
||||
grub_script_execute_cmd (struct grub_script_cmd *cmd)
|
||||
|
|
@ -87,11 +87,6 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
|
|||
char **args = 0;
|
||||
int i = 0;
|
||||
grub_command_t grubcmd;
|
||||
struct grub_arg_list *state;
|
||||
struct grub_arg_option *parser;
|
||||
int maxargs = 0;
|
||||
char **parsed_arglist;
|
||||
int numargs;
|
||||
grub_err_t ret = 0;
|
||||
int argcount = 0;
|
||||
grub_script_function_t func = 0;
|
||||
|
|
@ -143,27 +138,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
|
|||
|
||||
/* Execute the GRUB command or function. */
|
||||
if (grubcmd)
|
||||
{
|
||||
/* Count the amount of options the command has. */
|
||||
parser = (struct grub_arg_option *) grubcmd->options;
|
||||
while (parser && (parser++)->doc)
|
||||
maxargs++;
|
||||
|
||||
/* Set up the option state. */
|
||||
state = grub_malloc (sizeof (struct grub_arg_list) * maxargs);
|
||||
grub_memset (state, 0, sizeof (struct grub_arg_list) * maxargs);
|
||||
|
||||
/* Start the command. */
|
||||
if (! (grubcmd->flags & GRUB_COMMAND_FLAG_NO_ARG_PARSE))
|
||||
{
|
||||
if (grub_arg_parse (grubcmd, argcount, args, state, &parsed_arglist, &numargs))
|
||||
ret = (grubcmd->func) (state, numargs, parsed_arglist);
|
||||
}
|
||||
else
|
||||
ret = (grubcmd->func) (state, argcount, args);
|
||||
|
||||
grub_free (state);
|
||||
}
|
||||
ret = (grubcmd->func) (grubcmd, argcount, args);
|
||||
else
|
||||
ret = grub_script_function_call (func, argcount, args);
|
||||
|
||||
|
|
@ -273,3 +248,4 @@ grub_script_execute (struct grub_script *script)
|
|||
|
||||
return grub_script_execute_cmd (script->cmd);
|
||||
}
|
||||
|
||||
|
|
|
|||
130
normal/main.c
130
normal/main.c
|
|
@ -407,6 +407,39 @@ grub_normal_init_page (void)
|
|||
#undef TITLE
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_dyncmd_dispatcher (struct grub_command *cmd,
|
||||
int argc, char **args)
|
||||
{
|
||||
char *modname = cmd->data;
|
||||
grub_dl_t mod;
|
||||
grub_err_t ret;
|
||||
|
||||
mod = grub_dl_load (modname);
|
||||
if (mod)
|
||||
{
|
||||
char *name;
|
||||
|
||||
grub_free (modname);
|
||||
grub_dl_ref (mod);
|
||||
|
||||
name = (char *) cmd->name;
|
||||
grub_unregister_command (cmd);
|
||||
|
||||
cmd = grub_command_find (name);
|
||||
if (cmd)
|
||||
ret = (cmd->func) (cmd, argc, args);
|
||||
else
|
||||
ret = grub_errno;
|
||||
|
||||
grub_free (name);
|
||||
}
|
||||
else
|
||||
ret = grub_errno;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Read the file command.lst for auto-loading. */
|
||||
static void
|
||||
read_command_list (void)
|
||||
|
|
@ -427,19 +460,29 @@ read_command_list (void)
|
|||
file = grub_file_open (filename);
|
||||
if (file)
|
||||
{
|
||||
while (1)
|
||||
char *buf = 0;
|
||||
for (;; grub_free(buf))
|
||||
{
|
||||
char *p;
|
||||
char *p, *name, *modname;
|
||||
grub_command_t cmd;
|
||||
char *buf = get_line (file);
|
||||
int prio = 0;
|
||||
|
||||
buf = get_line (file);
|
||||
|
||||
if (! buf)
|
||||
break;
|
||||
|
||||
if (! grub_isgraph (buf[0]))
|
||||
name = buf;
|
||||
if (*name == '*')
|
||||
{
|
||||
name++;
|
||||
prio++;
|
||||
}
|
||||
|
||||
if (! grub_isgraph (name[0]))
|
||||
continue;
|
||||
|
||||
p = grub_strchr (buf, ':');
|
||||
p = grub_strchr (name, ':');
|
||||
if (! p)
|
||||
continue;
|
||||
|
||||
|
|
@ -450,19 +493,34 @@ read_command_list (void)
|
|||
if (! grub_isgraph (*p))
|
||||
continue;
|
||||
|
||||
cmd = grub_register_command (buf, 0,
|
||||
GRUB_COMMAND_FLAG_NOT_LOADED,
|
||||
0, 0, 0);
|
||||
if (! cmd)
|
||||
if (grub_dl_get (p))
|
||||
continue;
|
||||
|
||||
name = grub_strdup (name);
|
||||
if (! name)
|
||||
continue;
|
||||
|
||||
modname = grub_strdup (p);
|
||||
if (! modname)
|
||||
{
|
||||
grub_free (buf);
|
||||
grub_free (name);
|
||||
continue;
|
||||
}
|
||||
|
||||
cmd->module_name = grub_strdup (p);
|
||||
if (! cmd->module_name)
|
||||
grub_unregister_command (buf);
|
||||
grub_free (buf);
|
||||
cmd = grub_register_command_prio (name,
|
||||
grub_dyncmd_dispatcher,
|
||||
0, "not loaded", prio);
|
||||
if (! cmd)
|
||||
{
|
||||
grub_free (name);
|
||||
grub_free (modname);
|
||||
continue;
|
||||
}
|
||||
cmd->flags |= GRUB_COMMAND_FLAG_DYNCMD;
|
||||
cmd->data = modname;
|
||||
|
||||
/* Update the active flag. */
|
||||
grub_command_find (name);
|
||||
}
|
||||
|
||||
grub_file_close (file);
|
||||
|
|
@ -597,10 +655,30 @@ grub_normal_execute (const char *config, int nested)
|
|||
grub_cmdline_run (nested);
|
||||
}
|
||||
|
||||
/* Enter normal mode from rescue mode. */
|
||||
static void
|
||||
grub_rescue_cmd_normal (int argc, char *argv[])
|
||||
static grub_err_t
|
||||
grub_cmd_rescue (struct grub_command *cmd __attribute__ ((unused)),
|
||||
int argc __attribute__ ((unused)),
|
||||
char **args __attribute__ ((unused)))
|
||||
{
|
||||
grub_longjmp (grub_exit_env, 0);
|
||||
|
||||
/* Never reach here. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static grub_command_t cmd_normal;
|
||||
|
||||
/* Enter normal mode from rescue mode. */
|
||||
static grub_err_t
|
||||
grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
|
||||
int argc, char *argv[])
|
||||
{
|
||||
grub_command_t cmd_rescue;
|
||||
|
||||
grub_unregister_command (cmd_normal);
|
||||
cmd_rescue = grub_register_command ("rescue", grub_cmd_rescue,
|
||||
0, "enter rescue mode");
|
||||
|
||||
if (argc == 0)
|
||||
{
|
||||
/* Guess the config filename. It is necessary to make CONFIG static,
|
||||
|
|
@ -613,7 +691,7 @@ grub_rescue_cmd_normal (int argc, char *argv[])
|
|||
{
|
||||
config = grub_malloc (grub_strlen (prefix) + sizeof ("/grub.cfg"));
|
||||
if (! config)
|
||||
return;
|
||||
goto quit;
|
||||
|
||||
grub_sprintf (config, "%s/grub.cfg", prefix);
|
||||
grub_enter_normal_mode (config);
|
||||
|
|
@ -624,6 +702,12 @@ grub_rescue_cmd_normal (int argc, char *argv[])
|
|||
}
|
||||
else
|
||||
grub_enter_normal_mode (argv[0]);
|
||||
|
||||
quit:
|
||||
grub_unregister_command (cmd_rescue);
|
||||
cmd_normal = grub_register_command_prio ("normal", grub_cmd_normal,
|
||||
0, "enter normal mode", 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
GRUB_MOD_INIT(normal)
|
||||
|
|
@ -637,8 +721,8 @@ GRUB_MOD_INIT(normal)
|
|||
grub_set_history (GRUB_DEFAULT_HISTORY_SIZE);
|
||||
|
||||
/* Register a command "normal" for the rescue mode. */
|
||||
grub_rescue_register_command ("normal", grub_rescue_cmd_normal,
|
||||
"enter normal mode");
|
||||
cmd_normal = grub_register_command ("normal", grub_cmd_normal,
|
||||
0, "enter normal mode");
|
||||
|
||||
/* Reload terminal colors when these variables are written to. */
|
||||
grub_register_variable_hook ("color_normal", NULL, grub_env_write_color_normal);
|
||||
|
|
@ -647,14 +731,10 @@ GRUB_MOD_INIT(normal)
|
|||
/* Preserve hooks after context changes. */
|
||||
grub_env_export ("color_normal");
|
||||
grub_env_export ("color_highlight");
|
||||
|
||||
/* This registers some built-in commands. */
|
||||
grub_command_init ();
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(normal)
|
||||
{
|
||||
grub_set_history (0);
|
||||
grub_rescue_unregister_command ("normal");
|
||||
grub_unregister_command (cmd_normal);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue