eaef05533f
* commands/configfile.c (grub_cmd_configfile): Execute the configfile within its own context. * include/grub/env.h (grub_env_context_open): New prototype. (grub_env_context_close): Likewise. * kern/env.c (grub_env): Removed. (grub_env_sorted): Likewise. (grub_env_context): New variable. (grub_env_var_context): Likewise. (grub_env_find): Search both the active context and the global context. (grub_env_context_open): New function. (grub_env_context_close): Likewise. (grub_env_insert): Likewise. (grub_env_remove): Likewise. (grub_env_export): Likewise. (grub_env_set): Changed to use helper functions to avoid code duplication. (grub_env_iterate): Rewritten so both the current context and the global context are being used. * normal/command.c (export_command): New function. (grub_command_init): Register the `export' function.
55 lines
1.6 KiB
C
55 lines
1.6 KiB
C
/* configfile.c - command to manually load config file */
|
||
/*
|
||
* GRUB -- GRand Unified Bootloader
|
||
* Copyright (C) 2005,2006 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 2 of the License, or
|
||
* (at your option) any later version.
|
||
*
|
||
* This program 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, write to the Free Software
|
||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||
*/
|
||
|
||
#include <grub/normal.h>
|
||
#include <grub/dl.h>
|
||
#include <grub/arg.h>
|
||
#include <grub/term.h>
|
||
#include <grub/misc.h>
|
||
|
||
static grub_err_t
|
||
grub_cmd_configfile (struct grub_arg_list *state __attribute__ ((unused)),
|
||
int argc, char **args)
|
||
|
||
{
|
||
if (argc != 1)
|
||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
|
||
|
||
grub_cls ();
|
||
grub_env_context_open ();
|
||
grub_normal_execute (args[0], 1);
|
||
grub_env_context_close ();
|
||
|
||
return 0;
|
||
}
|
||
|
||
|
||
GRUB_MOD_INIT(configfile)
|
||
{
|
||
(void) mod; /* To stop warning. */
|
||
grub_register_command ("configfile", grub_cmd_configfile,
|
||
GRUB_COMMAND_FLAG_BOTH, "configfile FILE",
|
||
"Load another config file.", 0);
|
||
}
|
||
|
||
GRUB_MOD_FINI(configfile)
|
||
{
|
||
grub_unregister_command ("configfile");
|
||
}
|