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

Rename jail to extractor

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-20 23:01:34 +02:00
parent 1b71d7500b
commit a38b701cbf
12 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

32
grub-core/commands/configfile.c
View file

@ -27,34 +27,34 @@
static grub_err_t
grub_cmd_source (grub_command_t cmd, int argc, char **args)
{
int new_env, jail;
int new_env, extractor;
if (argc != 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
jail = (cmd->name[0] == 'j');
new_env = (cmd->name[jail ? 5 : 0] == 'c');
extractor = (cmd->name[0] == 'e');
new_env = (cmd->name[extractor ? sizeof ("extract_entries_") - 1 : 0] == 'c');
if (new_env)
grub_cls ();
if (new_env && !jail)
if (new_env && !extractor)
grub_env_context_open ();
if (jail)
grub_env_jail_open (!new_env);
if (extractor)
grub_env_extractor_open (!new_env);
grub_normal_execute (args[0], 1, ! new_env);
if (new_env && !jail)
if (new_env && !extractor)
grub_env_context_close ();
if (jail)
grub_env_jail_close (!new_env);
if (extractor)
grub_env_extractor_close (!new_env);
return 0;
}
static grub_command_t cmd_configfile, cmd_source, cmd_dot;
static grub_command_t cmd_jail_source, cmd_jail_configfile;
static grub_command_t cmd_extractor_source, cmd_extractor_configfile;
GRUB_MOD_INIT(configfile)
{
@ -67,14 +67,14 @@ GRUB_MOD_INIT(configfile)
N_("Load another config file without changing context.")
);
cmd_jail_source =
grub_register_command ("jail_source", grub_cmd_source,
cmd_extractor_source =
grub_register_command ("extract_entries_source", grub_cmd_source,
N_("FILE"),
N_("Load another config file without changing context but take only menuentries.")
);
cmd_jail_configfile =
grub_register_command ("jail_configfile", grub_cmd_source,
cmd_extractor_configfile =
grub_register_command ("extract_entries_configfile", grub_cmd_source,
N_("FILE"),
N_("Load another config file without changing context but take only menuentries.")
);
@ -90,7 +90,7 @@ GRUB_MOD_FINI(configfile)
{
grub_unregister_command (cmd_configfile);
grub_unregister_command (cmd_source);
grub_unregister_command (cmd_jail_configfile);
grub_unregister_command (cmd_jail_source);
grub_unregister_command (cmd_extractor_configfile);
grub_unregister_command (cmd_extractor_source);
grub_unregister_command (cmd_dot);
}