2005-11-06 22:19:59 +00:00
|
|
|
|
/* script.c -- Functions to create an in memory description of the script. */
|
|
|
|
|
/*
|
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2010-01-22 13:37:27 +00:00
|
|
|
|
* Copyright (C) 2005,2006,2007,2009,2010 Free Software Foundation, Inc.
|
2005-11-06 22:19:59 +00:00
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
2005-11-06 22:19:59 +00:00
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
2005-11-06 22:19:59 +00:00
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* GRUB is distributed in the hope that it will be useful,
|
2005-11-06 22:19:59 +00:00
|
|
|
|
* 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
|
2007-07-21 23:32:33 +00:00
|
|
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
2005-11-06 22:19:59 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <grub/misc.h>
|
2009-05-02 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_script.tab.c): Change normal/parser.y to
script/sh/parser.y.
(pkglib_MODULES): Add normal.mod and sh.mod.
(normal_SOURCES): New variable.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
(sh_mod_SOURCES): Likewise.
(sh_mod_CFLAGS): Likewise.
(sh_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (normal/lexer.c_DEPENDENCIES): Changed to
script/sh/lexer.c_DEPENDENCIES.
(kernel_img_SOURCES): Remove kern/rescue.c, and kern/reader.c,
kern/rescue_reader.c and kern/rescue_parser.c.
(kernel_img_HEADERS): Remove rescue.h, add reader.h.
(grub_emu_SOURCES): Change source files.
(pkglib_MODULES): Remove normal.mod.
(normal_SOURCES): Removed.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1276.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/command.h (grub_command_execute): New inline function.
* include/grub/menu.h (grub_menu_entry): Removed commands field.
* include/grub/normal.h: Remove <grub/setjmp.h>.
(grub_fs_module_list): Moved to normal/autofs.c.
(grub_exit_env): Removed.
(grub_command_execute): Likewise.
(grub_normal_menu_addentry): Renamed to grub_menu_addentry, removed
parameter script.
(read_command_list): New function declaration.
(read_fs_list): Likewise.
* include/parser.h: Include <grub/reader.h>.
(grub_parser_split_cmdline): Change type of getline parameter.
(grub_parser): New structure.
(grub_parser_class): New variable.
(grub_parser_execute): New function declaration.
(grub_register_rescue_parser): Likewise.
(grub_parser_register): New inline function.
(grub_parser_unregister): Likewise.
(grub_parser_get_current): Likewise.
(grub_parser_set_current): Likewise.
* include/grub/reader.h: New file.
* kern/reader.c: Likewise.
* kern/rescue_parser.c: Likewise.
* kern/rescue_reader.c: Likewise.
* normal/autofs.c: Likewise.
* normal/dyncmd.c: Likewise.
* include/grub/rescue.h: Removed.
* normal/command.h: Likewise.
* include/grub/script.h: Moved to ...
* include/grub/script_sh.h: ... Moved here.
* normal/execute.c: Moved to ...
* script/sh/execute.c: ... Moved here.
* normal/function.c: Moved to ...
* script/sh/function.c: ... Moved here.
* normal/lexer.c: Moved to ...
* script/sh/lexer.c: ... Moved here.
* normal/parser.y: Moved to ...
* script/sh/parser.y: ... Moved here.
* normal/script.c: Moved to ...
* script/sh/script.c: ... Moved here.
* normal/main.c: Remove <grub/rescue.h> and <grub/script.h>, include
<grub/reader.h>.
(grub_exit_env): Removed.
(fs_module_list): Moved to normal/autofs.c.
(grub_file_getline): Don't handle comment here.
(free_menu): Skip removed field entry->commands.
(grub_normal_menu_addentry): Removed as grub_menu_entry, removed
script parameter.
(read_config_file): Removed nested parameter, change getline function.
(grub_enter_normal_mode): Removed.
(grub_dyncmd_dispatcher): Moved to normal/dyncmd.c.
(read_command_list): Likewise.
(autoload_fs_module): Moved to normal/autofs.c.
(read_fs_list): Likewise.
(reader_nested): New variable.
(grub_normal_execute): Run parser.sh to switch to sh parser.
(grub_cmd_rescue): Removed.
(cmd_normal): Removed.
(grub_cmd_normal): Unregister itself at the beginning. Don't register
rescue command.
(grub_cmdline_run): New function.
(grub_normal_reader_init): Likewise.
(grub_normal_read_line): Likewise.
(grub_env_write_pager): Likewise.
(cmdline): New variable.
(grub_normal_reader): Likewise.
(GRUB_MOD_INIT): Register normal reader and set as current, register
pager hook, register normal command with grub_register_command_prio,
so that it won't show up in command.lst.
(GRUB_MOD_FINI): Unregister normal reader, unhook pager, clear
grub_fs_autoload_hook.
* normal/menu.c: Remove <grub/script.h>, add <grub/command.h>.
(grub_menu_execute_entry): Replace grub_script_execute with
grub_parser_execute, change parameter to grub_command_execute.
* normal/menu_text.c: Remove <grub/script.h>.
* normal/menu_entry.c: Remove <grub/script.h>, add <grub/command.h>
and <grub/parser.h>.
(run): Change editor_getline to use new parser interface. Change
parameter to grub_command_execute.
* kern/main.c: Remove <grub/rescue.h>, include <grub/command.h>,
<grub/reader.h> and <grub/parser.h>.
(grub_load_normal_mode): Execute normal command.
(grub_main): Call grub_register_core_commands,
grub_register_rescue_parser and grub_register_rescue_reader, use
grub_reader_loop to enter input loop.
* kern/parser.c (grub_parser_spli_cmdline): Change type of getline
parameter.
(grub_parser_class): New variable.
(grub_parser_execute): New function.
* loader/i386/multiboot.c: Remove <grub/rescue.h>.
* loader/multiboot2.c: Likewise.
* loader/sparc64/ieee1275/linux.c: Likewise.
* util/grub-emu.c (read_command_list): New dummy function.
2009-05-02 19:49:34 +00:00
|
|
|
|
#include <grub/script_sh.h>
|
2005-11-06 22:19:59 +00:00
|
|
|
|
#include <grub/parser.h>
|
|
|
|
|
#include <grub/mm.h>
|
|
|
|
|
|
|
|
|
|
/* It is not possible to deallocate the memory when a syntax error was
|
|
|
|
|
found. Because of that it is required to keep track of all memory
|
2010-01-22 13:37:27 +00:00
|
|
|
|
allocations. The memory is freed in case of an error, or assigned
|
|
|
|
|
to the parsed script when parsing was successful.
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
In case of the normal malloc, some additional bytes are allocated
|
2005-11-06 22:19:59 +00:00
|
|
|
|
for this datastructure. All reserved memory is stored in a linked
|
2007-12-30 08:52:06 +00:00
|
|
|
|
list so it can be easily freed. The original memory can be found
|
2005-11-06 22:19:59 +00:00
|
|
|
|
from &mem. */
|
|
|
|
|
struct grub_script_mem
|
|
|
|
|
{
|
|
|
|
|
struct grub_script_mem *next;
|
|
|
|
|
char mem;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Return malloc'ed memory and keep track of the allocation. */
|
|
|
|
|
void *
|
2006-04-17 13:01:20 +00:00
|
|
|
|
grub_script_malloc (struct grub_parser_param *state, grub_size_t size)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_script_mem *mem;
|
|
|
|
|
mem = (struct grub_script_mem *) grub_malloc (size + sizeof (*mem)
|
|
|
|
|
- sizeof (char));
|
2010-01-22 13:37:27 +00:00
|
|
|
|
if (!mem)
|
|
|
|
|
return 0;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
|
|
grub_dprintf ("scripting", "malloc %p\n", mem);
|
2006-04-17 13:01:20 +00:00
|
|
|
|
mem->next = state->memused;
|
|
|
|
|
state->memused = mem;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
return (void *) &mem->mem;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Free all memory described by MEM. */
|
2010-06-10 15:19:57 +00:00
|
|
|
|
void
|
2005-11-06 22:19:59 +00:00
|
|
|
|
grub_script_mem_free (struct grub_script_mem *mem)
|
|
|
|
|
{
|
|
|
|
|
struct grub_script_mem *memfree;
|
|
|
|
|
|
|
|
|
|
while (mem)
|
|
|
|
|
{
|
|
|
|
|
memfree = mem->next;
|
|
|
|
|
grub_dprintf ("scripting", "free %p\n", mem);
|
|
|
|
|
grub_free (mem);
|
|
|
|
|
mem = memfree;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Start recording memory usage. Returns the memory that should be
|
|
|
|
|
restored when calling stop. */
|
|
|
|
|
struct grub_script_mem *
|
2006-04-17 13:01:20 +00:00
|
|
|
|
grub_script_mem_record (struct grub_parser_param *state)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
|
struct grub_script_mem *mem = state->memused;
|
|
|
|
|
state->memused = 0;
|
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
return mem;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Stop recording memory usage. Restore previous recordings using
|
|
|
|
|
RESTORE. Return the recorded memory. */
|
|
|
|
|
struct grub_script_mem *
|
2006-04-17 13:01:20 +00:00
|
|
|
|
grub_script_mem_record_stop (struct grub_parser_param *state,
|
|
|
|
|
struct grub_script_mem *restore)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
|
struct grub_script_mem *mem = state->memused;
|
|
|
|
|
state->memused = restore;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
return mem;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Free the memory reserved for CMD and all of it's children. */
|
|
|
|
|
void
|
|
|
|
|
grub_script_free (struct grub_script *script)
|
|
|
|
|
{
|
2010-07-21 23:19:05 +00:00
|
|
|
|
struct grub_script *s;
|
2010-07-22 15:45:14 +00:00
|
|
|
|
struct grub_script *t;
|
2010-07-21 23:19:05 +00:00
|
|
|
|
|
2010-07-22 15:43:45 +00:00
|
|
|
|
if (! script)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
return;
|
2010-06-10 06:42:03 +00:00
|
|
|
|
|
|
|
|
|
if (script->mem)
|
|
|
|
|
grub_script_mem_free (script->mem);
|
|
|
|
|
|
2010-07-21 23:19:05 +00:00
|
|
|
|
s = script->children;
|
|
|
|
|
while (s) {
|
2010-07-22 15:45:14 +00:00
|
|
|
|
t = s->siblings;
|
2010-07-22 13:31:40 +00:00
|
|
|
|
grub_script_put (s);
|
2010-07-22 15:45:14 +00:00
|
|
|
|
s = t;
|
2010-07-21 23:19:05 +00:00
|
|
|
|
}
|
2005-11-06 22:19:59 +00:00
|
|
|
|
grub_free (script);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
/* Extend the argument arg with a variable or string of text. If ARG
|
|
|
|
|
is zero a new list is created. */
|
|
|
|
|
struct grub_script_arg *
|
2010-01-22 13:37:27 +00:00
|
|
|
|
grub_script_arg_add (struct grub_parser_param *state,
|
|
|
|
|
struct grub_script_arg *arg, grub_script_arg_type_t type,
|
|
|
|
|
char *str)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_script_arg *argpart;
|
|
|
|
|
struct grub_script_arg *ll;
|
2009-08-24 19:08:11 +00:00
|
|
|
|
int len;
|
2009-05-02 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_script.tab.c): Change normal/parser.y to
script/sh/parser.y.
(pkglib_MODULES): Add normal.mod and sh.mod.
(normal_SOURCES): New variable.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
(sh_mod_SOURCES): Likewise.
(sh_mod_CFLAGS): Likewise.
(sh_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (normal/lexer.c_DEPENDENCIES): Changed to
script/sh/lexer.c_DEPENDENCIES.
(kernel_img_SOURCES): Remove kern/rescue.c, and kern/reader.c,
kern/rescue_reader.c and kern/rescue_parser.c.
(kernel_img_HEADERS): Remove rescue.h, add reader.h.
(grub_emu_SOURCES): Change source files.
(pkglib_MODULES): Remove normal.mod.
(normal_SOURCES): Removed.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1276.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/command.h (grub_command_execute): New inline function.
* include/grub/menu.h (grub_menu_entry): Removed commands field.
* include/grub/normal.h: Remove <grub/setjmp.h>.
(grub_fs_module_list): Moved to normal/autofs.c.
(grub_exit_env): Removed.
(grub_command_execute): Likewise.
(grub_normal_menu_addentry): Renamed to grub_menu_addentry, removed
parameter script.
(read_command_list): New function declaration.
(read_fs_list): Likewise.
* include/parser.h: Include <grub/reader.h>.
(grub_parser_split_cmdline): Change type of getline parameter.
(grub_parser): New structure.
(grub_parser_class): New variable.
(grub_parser_execute): New function declaration.
(grub_register_rescue_parser): Likewise.
(grub_parser_register): New inline function.
(grub_parser_unregister): Likewise.
(grub_parser_get_current): Likewise.
(grub_parser_set_current): Likewise.
* include/grub/reader.h: New file.
* kern/reader.c: Likewise.
* kern/rescue_parser.c: Likewise.
* kern/rescue_reader.c: Likewise.
* normal/autofs.c: Likewise.
* normal/dyncmd.c: Likewise.
* include/grub/rescue.h: Removed.
* normal/command.h: Likewise.
* include/grub/script.h: Moved to ...
* include/grub/script_sh.h: ... Moved here.
* normal/execute.c: Moved to ...
* script/sh/execute.c: ... Moved here.
* normal/function.c: Moved to ...
* script/sh/function.c: ... Moved here.
* normal/lexer.c: Moved to ...
* script/sh/lexer.c: ... Moved here.
* normal/parser.y: Moved to ...
* script/sh/parser.y: ... Moved here.
* normal/script.c: Moved to ...
* script/sh/script.c: ... Moved here.
* normal/main.c: Remove <grub/rescue.h> and <grub/script.h>, include
<grub/reader.h>.
(grub_exit_env): Removed.
(fs_module_list): Moved to normal/autofs.c.
(grub_file_getline): Don't handle comment here.
(free_menu): Skip removed field entry->commands.
(grub_normal_menu_addentry): Removed as grub_menu_entry, removed
script parameter.
(read_config_file): Removed nested parameter, change getline function.
(grub_enter_normal_mode): Removed.
(grub_dyncmd_dispatcher): Moved to normal/dyncmd.c.
(read_command_list): Likewise.
(autoload_fs_module): Moved to normal/autofs.c.
(read_fs_list): Likewise.
(reader_nested): New variable.
(grub_normal_execute): Run parser.sh to switch to sh parser.
(grub_cmd_rescue): Removed.
(cmd_normal): Removed.
(grub_cmd_normal): Unregister itself at the beginning. Don't register
rescue command.
(grub_cmdline_run): New function.
(grub_normal_reader_init): Likewise.
(grub_normal_read_line): Likewise.
(grub_env_write_pager): Likewise.
(cmdline): New variable.
(grub_normal_reader): Likewise.
(GRUB_MOD_INIT): Register normal reader and set as current, register
pager hook, register normal command with grub_register_command_prio,
so that it won't show up in command.lst.
(GRUB_MOD_FINI): Unregister normal reader, unhook pager, clear
grub_fs_autoload_hook.
* normal/menu.c: Remove <grub/script.h>, add <grub/command.h>.
(grub_menu_execute_entry): Replace grub_script_execute with
grub_parser_execute, change parameter to grub_command_execute.
* normal/menu_text.c: Remove <grub/script.h>.
* normal/menu_entry.c: Remove <grub/script.h>, add <grub/command.h>
and <grub/parser.h>.
(run): Change editor_getline to use new parser interface. Change
parameter to grub_command_execute.
* kern/main.c: Remove <grub/rescue.h>, include <grub/command.h>,
<grub/reader.h> and <grub/parser.h>.
(grub_load_normal_mode): Execute normal command.
(grub_main): Call grub_register_core_commands,
grub_register_rescue_parser and grub_register_rescue_reader, use
grub_reader_loop to enter input loop.
* kern/parser.c (grub_parser_spli_cmdline): Change type of getline
parameter.
(grub_parser_class): New variable.
(grub_parser_execute): New function.
* loader/i386/multiboot.c: Remove <grub/rescue.h>.
* loader/multiboot2.c: Likewise.
* loader/sparc64/ieee1275/linux.c: Likewise.
* util/grub-emu.c (read_command_list): New dummy function.
2009-05-02 19:49:34 +00:00
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
argpart =
|
|
|
|
|
(struct grub_script_arg *) grub_script_malloc (state, sizeof (*arg));
|
|
|
|
|
if (!argpart)
|
|
|
|
|
return arg;
|
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
argpart->type = type;
|
2010-07-20 22:17:30 +00:00
|
|
|
|
argpart->script = 0;
|
2010-06-10 06:42:03 +00:00
|
|
|
|
|
2009-08-24 19:08:11 +00:00
|
|
|
|
len = grub_strlen (str) + 1;
|
|
|
|
|
argpart->str = grub_script_malloc (state, len);
|
2010-01-22 13:37:27 +00:00
|
|
|
|
if (!argpart->str)
|
|
|
|
|
return arg; /* argpart is freed later, during grub_script_free. */
|
|
|
|
|
|
2009-08-24 19:08:11 +00:00
|
|
|
|
grub_memcpy (argpart->str, str, len);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
argpart->next = 0;
|
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
if (!arg)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
return argpart;
|
|
|
|
|
|
|
|
|
|
for (ll = arg; ll->next; ll = ll->next);
|
|
|
|
|
ll->next = argpart;
|
2009-05-02 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_script.tab.c): Change normal/parser.y to
script/sh/parser.y.
(pkglib_MODULES): Add normal.mod and sh.mod.
(normal_SOURCES): New variable.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
(sh_mod_SOURCES): Likewise.
(sh_mod_CFLAGS): Likewise.
(sh_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (normal/lexer.c_DEPENDENCIES): Changed to
script/sh/lexer.c_DEPENDENCIES.
(kernel_img_SOURCES): Remove kern/rescue.c, and kern/reader.c,
kern/rescue_reader.c and kern/rescue_parser.c.
(kernel_img_HEADERS): Remove rescue.h, add reader.h.
(grub_emu_SOURCES): Change source files.
(pkglib_MODULES): Remove normal.mod.
(normal_SOURCES): Removed.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1276.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/command.h (grub_command_execute): New inline function.
* include/grub/menu.h (grub_menu_entry): Removed commands field.
* include/grub/normal.h: Remove <grub/setjmp.h>.
(grub_fs_module_list): Moved to normal/autofs.c.
(grub_exit_env): Removed.
(grub_command_execute): Likewise.
(grub_normal_menu_addentry): Renamed to grub_menu_addentry, removed
parameter script.
(read_command_list): New function declaration.
(read_fs_list): Likewise.
* include/parser.h: Include <grub/reader.h>.
(grub_parser_split_cmdline): Change type of getline parameter.
(grub_parser): New structure.
(grub_parser_class): New variable.
(grub_parser_execute): New function declaration.
(grub_register_rescue_parser): Likewise.
(grub_parser_register): New inline function.
(grub_parser_unregister): Likewise.
(grub_parser_get_current): Likewise.
(grub_parser_set_current): Likewise.
* include/grub/reader.h: New file.
* kern/reader.c: Likewise.
* kern/rescue_parser.c: Likewise.
* kern/rescue_reader.c: Likewise.
* normal/autofs.c: Likewise.
* normal/dyncmd.c: Likewise.
* include/grub/rescue.h: Removed.
* normal/command.h: Likewise.
* include/grub/script.h: Moved to ...
* include/grub/script_sh.h: ... Moved here.
* normal/execute.c: Moved to ...
* script/sh/execute.c: ... Moved here.
* normal/function.c: Moved to ...
* script/sh/function.c: ... Moved here.
* normal/lexer.c: Moved to ...
* script/sh/lexer.c: ... Moved here.
* normal/parser.y: Moved to ...
* script/sh/parser.y: ... Moved here.
* normal/script.c: Moved to ...
* script/sh/script.c: ... Moved here.
* normal/main.c: Remove <grub/rescue.h> and <grub/script.h>, include
<grub/reader.h>.
(grub_exit_env): Removed.
(fs_module_list): Moved to normal/autofs.c.
(grub_file_getline): Don't handle comment here.
(free_menu): Skip removed field entry->commands.
(grub_normal_menu_addentry): Removed as grub_menu_entry, removed
script parameter.
(read_config_file): Removed nested parameter, change getline function.
(grub_enter_normal_mode): Removed.
(grub_dyncmd_dispatcher): Moved to normal/dyncmd.c.
(read_command_list): Likewise.
(autoload_fs_module): Moved to normal/autofs.c.
(read_fs_list): Likewise.
(reader_nested): New variable.
(grub_normal_execute): Run parser.sh to switch to sh parser.
(grub_cmd_rescue): Removed.
(cmd_normal): Removed.
(grub_cmd_normal): Unregister itself at the beginning. Don't register
rescue command.
(grub_cmdline_run): New function.
(grub_normal_reader_init): Likewise.
(grub_normal_read_line): Likewise.
(grub_env_write_pager): Likewise.
(cmdline): New variable.
(grub_normal_reader): Likewise.
(GRUB_MOD_INIT): Register normal reader and set as current, register
pager hook, register normal command with grub_register_command_prio,
so that it won't show up in command.lst.
(GRUB_MOD_FINI): Unregister normal reader, unhook pager, clear
grub_fs_autoload_hook.
* normal/menu.c: Remove <grub/script.h>, add <grub/command.h>.
(grub_menu_execute_entry): Replace grub_script_execute with
grub_parser_execute, change parameter to grub_command_execute.
* normal/menu_text.c: Remove <grub/script.h>.
* normal/menu_entry.c: Remove <grub/script.h>, add <grub/command.h>
and <grub/parser.h>.
(run): Change editor_getline to use new parser interface. Change
parameter to grub_command_execute.
* kern/main.c: Remove <grub/rescue.h>, include <grub/command.h>,
<grub/reader.h> and <grub/parser.h>.
(grub_load_normal_mode): Execute normal command.
(grub_main): Call grub_register_core_commands,
grub_register_rescue_parser and grub_register_rescue_reader, use
grub_reader_loop to enter input loop.
* kern/parser.c (grub_parser_spli_cmdline): Change type of getline
parameter.
(grub_parser_class): New variable.
(grub_parser_execute): New function.
* loader/i386/multiboot.c: Remove <grub/rescue.h>.
* loader/multiboot2.c: Likewise.
* loader/sparc64/ieee1275/linux.c: Likewise.
* util/grub-emu.c (read_command_list): New dummy function.
2009-05-02 19:49:34 +00:00
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
return arg;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add the argument ARG to the end of the argument list LIST. If LIST
|
|
|
|
|
is zero, a new list will be created. */
|
|
|
|
|
struct grub_script_arglist *
|
2006-04-17 13:01:20 +00:00
|
|
|
|
grub_script_add_arglist (struct grub_parser_param *state,
|
2010-01-22 13:37:27 +00:00
|
|
|
|
struct grub_script_arglist *list,
|
|
|
|
|
struct grub_script_arg *arg)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_script_arglist *link;
|
|
|
|
|
struct grub_script_arglist *ll;
|
|
|
|
|
|
|
|
|
|
grub_dprintf ("scripting", "arglist\n");
|
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
link =
|
|
|
|
|
(struct grub_script_arglist *) grub_script_malloc (state, sizeof (*link));
|
|
|
|
|
if (!link)
|
|
|
|
|
return list;
|
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
link->next = 0;
|
|
|
|
|
link->arg = arg;
|
|
|
|
|
link->argcount = 0;
|
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
if (!list)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
{
|
|
|
|
|
link->argcount++;
|
|
|
|
|
return link;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
list->argcount++;
|
|
|
|
|
|
|
|
|
|
/* Look up the last link in the chain. */
|
|
|
|
|
for (ll = list; ll->next; ll = ll->next);
|
|
|
|
|
ll->next = link;
|
|
|
|
|
|
|
|
|
|
return list;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create a command that describes a single command line. CMDLINE
|
|
|
|
|
contains the name of the command that should be executed. ARGLIST
|
|
|
|
|
holds all arguments for this command. */
|
|
|
|
|
struct grub_script_cmd *
|
2006-04-17 13:01:20 +00:00
|
|
|
|
grub_script_create_cmdline (struct grub_parser_param *state,
|
2009-06-04 16:18:35 +00:00
|
|
|
|
struct grub_script_arglist *arglist)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_script_cmdline *cmd;
|
|
|
|
|
|
|
|
|
|
grub_dprintf ("scripting", "cmdline\n");
|
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
|
cmd = grub_script_malloc (state, sizeof (*cmd));
|
2010-01-22 13:37:27 +00:00
|
|
|
|
if (!cmd)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
cmd->cmd.exec = grub_script_execute_cmdline;
|
|
|
|
|
cmd->cmd.next = 0;
|
|
|
|
|
cmd->arglist = arglist;
|
|
|
|
|
|
|
|
|
|
return (struct grub_script_cmd *) cmd;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create a command that functions as an if statement. If BOOL is
|
2006-05-28 21:58:35 +00:00
|
|
|
|
evaluated to true (the value is returned in envvar '?'), the
|
2005-11-06 22:19:59 +00:00
|
|
|
|
interpreter will run the command TRUE, otherwise the interpreter
|
|
|
|
|
runs the command FALSE. */
|
|
|
|
|
struct grub_script_cmd *
|
2006-04-17 13:01:20 +00:00
|
|
|
|
grub_script_create_cmdif (struct grub_parser_param *state,
|
2006-05-28 21:58:35 +00:00
|
|
|
|
struct grub_script_cmd *exec_to_evaluate,
|
|
|
|
|
struct grub_script_cmd *exec_on_true,
|
|
|
|
|
struct grub_script_cmd *exec_on_false)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_script_cmdif *cmd;
|
|
|
|
|
|
|
|
|
|
grub_dprintf ("scripting", "cmdif\n");
|
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
|
cmd = grub_script_malloc (state, sizeof (*cmd));
|
2010-01-22 13:37:27 +00:00
|
|
|
|
if (!cmd)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
cmd->cmd.exec = grub_script_execute_cmdif;
|
|
|
|
|
cmd->cmd.next = 0;
|
2006-05-28 21:58:35 +00:00
|
|
|
|
cmd->exec_to_evaluate = exec_to_evaluate;
|
|
|
|
|
cmd->exec_on_true = exec_on_true;
|
|
|
|
|
cmd->exec_on_false = exec_on_false;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
|
|
return (struct grub_script_cmd *) cmd;
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-23 05:33:41 +00:00
|
|
|
|
/* Create a command that functions as a for statement. */
|
|
|
|
|
struct grub_script_cmd *
|
|
|
|
|
grub_script_create_cmdfor (struct grub_parser_param *state,
|
|
|
|
|
struct grub_script_arg *name,
|
|
|
|
|
struct grub_script_arglist *words,
|
|
|
|
|
struct grub_script_cmd *list)
|
|
|
|
|
{
|
|
|
|
|
struct grub_script_cmdfor *cmd;
|
|
|
|
|
|
|
|
|
|
grub_dprintf ("scripting", "cmdfor\n");
|
|
|
|
|
|
|
|
|
|
cmd = grub_script_malloc (state, sizeof (*cmd));
|
|
|
|
|
if (! cmd)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
cmd->cmd.exec = grub_script_execute_cmdfor;
|
|
|
|
|
cmd->cmd.next = 0;
|
|
|
|
|
cmd->name = name;
|
|
|
|
|
cmd->words = words;
|
|
|
|
|
cmd->list = list;
|
|
|
|
|
|
|
|
|
|
return (struct grub_script_cmd *) cmd;
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-23 05:49:26 +00:00
|
|
|
|
/* Create a "while" or "until" command. */
|
|
|
|
|
struct grub_script_cmd *
|
|
|
|
|
grub_script_create_cmdwhile (struct grub_parser_param *state,
|
|
|
|
|
struct grub_script_cmd *cond,
|
|
|
|
|
struct grub_script_cmd *list,
|
|
|
|
|
int is_an_until_loop)
|
|
|
|
|
{
|
|
|
|
|
struct grub_script_cmdwhile *cmd;
|
|
|
|
|
|
|
|
|
|
cmd = grub_script_malloc (state, sizeof (*cmd));
|
|
|
|
|
if (! cmd)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
cmd->cmd.exec = grub_script_execute_cmdwhile;
|
|
|
|
|
cmd->cmd.next = 0;
|
|
|
|
|
cmd->cond = cond;
|
|
|
|
|
cmd->list = list;
|
|
|
|
|
cmd->until = is_an_until_loop;
|
|
|
|
|
|
|
|
|
|
return (struct grub_script_cmd *) cmd;
|
|
|
|
|
}
|
|
|
|
|
|
2010-05-05 08:35:06 +00:00
|
|
|
|
/* Create a chain of commands. LAST contains the command that should
|
|
|
|
|
be added at the end of LIST's list. If LIST is zero, a new list
|
|
|
|
|
will be created. */
|
2005-11-06 22:19:59 +00:00
|
|
|
|
struct grub_script_cmd *
|
2010-05-05 08:35:06 +00:00
|
|
|
|
grub_script_append_cmd (struct grub_parser_param *state,
|
|
|
|
|
struct grub_script_cmd *list,
|
|
|
|
|
struct grub_script_cmd *last)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
{
|
2010-01-22 13:37:27 +00:00
|
|
|
|
struct grub_script_cmd *ptr;
|
|
|
|
|
|
2010-05-05 08:35:06 +00:00
|
|
|
|
grub_dprintf ("scripting", "append command\n");
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
2010-05-05 08:35:06 +00:00
|
|
|
|
if (! last)
|
|
|
|
|
return list;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
2010-05-05 08:35:06 +00:00
|
|
|
|
if (! list)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
{
|
2010-05-05 08:35:06 +00:00
|
|
|
|
list = grub_script_malloc (state, sizeof (*list));
|
|
|
|
|
if (! list)
|
2010-01-22 13:37:27 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
2010-05-05 08:35:06 +00:00
|
|
|
|
list->exec = grub_script_execute_cmdlist;
|
|
|
|
|
list->next = last;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2010-05-05 08:35:06 +00:00
|
|
|
|
ptr = list;
|
|
|
|
|
while (ptr->next)
|
|
|
|
|
ptr = ptr->next;
|
|
|
|
|
|
|
|
|
|
ptr->next = last;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-05-05 08:35:06 +00:00
|
|
|
|
return list;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
struct grub_script *
|
|
|
|
|
grub_script_create (struct grub_script_cmd *cmd, struct grub_script_mem *mem)
|
|
|
|
|
{
|
|
|
|
|
struct grub_script *parsed;
|
|
|
|
|
|
|
|
|
|
parsed = grub_malloc (sizeof (*parsed));
|
2010-06-10 15:19:57 +00:00
|
|
|
|
if (! parsed)
|
|
|
|
|
return 0;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
|
|
parsed->mem = mem;
|
|
|
|
|
parsed->cmd = cmd;
|
2010-06-10 15:19:57 +00:00
|
|
|
|
parsed->refcnt = 0;
|
2010-07-21 23:19:05 +00:00
|
|
|
|
parsed->siblings = 0;
|
|
|
|
|
parsed->children = 0;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
|
|
return parsed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse the script passed in SCRIPT and return the parsed
|
|
|
|
|
datastructure that is ready to be interpreted. */
|
|
|
|
|
struct grub_script *
|
2009-05-02 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_script.tab.c): Change normal/parser.y to
script/sh/parser.y.
(pkglib_MODULES): Add normal.mod and sh.mod.
(normal_SOURCES): New variable.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
(sh_mod_SOURCES): Likewise.
(sh_mod_CFLAGS): Likewise.
(sh_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (normal/lexer.c_DEPENDENCIES): Changed to
script/sh/lexer.c_DEPENDENCIES.
(kernel_img_SOURCES): Remove kern/rescue.c, and kern/reader.c,
kern/rescue_reader.c and kern/rescue_parser.c.
(kernel_img_HEADERS): Remove rescue.h, add reader.h.
(grub_emu_SOURCES): Change source files.
(pkglib_MODULES): Remove normal.mod.
(normal_SOURCES): Removed.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1276.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/command.h (grub_command_execute): New inline function.
* include/grub/menu.h (grub_menu_entry): Removed commands field.
* include/grub/normal.h: Remove <grub/setjmp.h>.
(grub_fs_module_list): Moved to normal/autofs.c.
(grub_exit_env): Removed.
(grub_command_execute): Likewise.
(grub_normal_menu_addentry): Renamed to grub_menu_addentry, removed
parameter script.
(read_command_list): New function declaration.
(read_fs_list): Likewise.
* include/parser.h: Include <grub/reader.h>.
(grub_parser_split_cmdline): Change type of getline parameter.
(grub_parser): New structure.
(grub_parser_class): New variable.
(grub_parser_execute): New function declaration.
(grub_register_rescue_parser): Likewise.
(grub_parser_register): New inline function.
(grub_parser_unregister): Likewise.
(grub_parser_get_current): Likewise.
(grub_parser_set_current): Likewise.
* include/grub/reader.h: New file.
* kern/reader.c: Likewise.
* kern/rescue_parser.c: Likewise.
* kern/rescue_reader.c: Likewise.
* normal/autofs.c: Likewise.
* normal/dyncmd.c: Likewise.
* include/grub/rescue.h: Removed.
* normal/command.h: Likewise.
* include/grub/script.h: Moved to ...
* include/grub/script_sh.h: ... Moved here.
* normal/execute.c: Moved to ...
* script/sh/execute.c: ... Moved here.
* normal/function.c: Moved to ...
* script/sh/function.c: ... Moved here.
* normal/lexer.c: Moved to ...
* script/sh/lexer.c: ... Moved here.
* normal/parser.y: Moved to ...
* script/sh/parser.y: ... Moved here.
* normal/script.c: Moved to ...
* script/sh/script.c: ... Moved here.
* normal/main.c: Remove <grub/rescue.h> and <grub/script.h>, include
<grub/reader.h>.
(grub_exit_env): Removed.
(fs_module_list): Moved to normal/autofs.c.
(grub_file_getline): Don't handle comment here.
(free_menu): Skip removed field entry->commands.
(grub_normal_menu_addentry): Removed as grub_menu_entry, removed
script parameter.
(read_config_file): Removed nested parameter, change getline function.
(grub_enter_normal_mode): Removed.
(grub_dyncmd_dispatcher): Moved to normal/dyncmd.c.
(read_command_list): Likewise.
(autoload_fs_module): Moved to normal/autofs.c.
(read_fs_list): Likewise.
(reader_nested): New variable.
(grub_normal_execute): Run parser.sh to switch to sh parser.
(grub_cmd_rescue): Removed.
(cmd_normal): Removed.
(grub_cmd_normal): Unregister itself at the beginning. Don't register
rescue command.
(grub_cmdline_run): New function.
(grub_normal_reader_init): Likewise.
(grub_normal_read_line): Likewise.
(grub_env_write_pager): Likewise.
(cmdline): New variable.
(grub_normal_reader): Likewise.
(GRUB_MOD_INIT): Register normal reader and set as current, register
pager hook, register normal command with grub_register_command_prio,
so that it won't show up in command.lst.
(GRUB_MOD_FINI): Unregister normal reader, unhook pager, clear
grub_fs_autoload_hook.
* normal/menu.c: Remove <grub/script.h>, add <grub/command.h>.
(grub_menu_execute_entry): Replace grub_script_execute with
grub_parser_execute, change parameter to grub_command_execute.
* normal/menu_text.c: Remove <grub/script.h>.
* normal/menu_entry.c: Remove <grub/script.h>, add <grub/command.h>
and <grub/parser.h>.
(run): Change editor_getline to use new parser interface. Change
parameter to grub_command_execute.
* kern/main.c: Remove <grub/rescue.h>, include <grub/command.h>,
<grub/reader.h> and <grub/parser.h>.
(grub_load_normal_mode): Execute normal command.
(grub_main): Call grub_register_core_commands,
grub_register_rescue_parser and grub_register_rescue_reader, use
grub_reader_loop to enter input loop.
* kern/parser.c (grub_parser_spli_cmdline): Change type of getline
parameter.
(grub_parser_class): New variable.
(grub_parser_execute): New function.
* loader/i386/multiboot.c: Remove <grub/rescue.h>.
* loader/multiboot2.c: Likewise.
* loader/sparc64/ieee1275/linux.c: Likewise.
* util/grub-emu.c (read_command_list): New dummy function.
2009-05-02 19:49:34 +00:00
|
|
|
|
grub_script_parse (char *script, grub_reader_getline_t getline)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_script *parsed;
|
|
|
|
|
struct grub_script_mem *membackup;
|
2006-04-17 13:01:20 +00:00
|
|
|
|
struct grub_lexer_param *lexstate;
|
|
|
|
|
struct grub_parser_param *parsestate;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
2010-06-10 15:19:57 +00:00
|
|
|
|
parsed = grub_script_create (0, 0);
|
2010-01-22 13:37:27 +00:00
|
|
|
|
if (!parsed)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
2009-07-16 22:14:09 +00:00
|
|
|
|
parsestate = grub_zalloc (sizeof (*parsestate));
|
2010-01-22 13:37:27 +00:00
|
|
|
|
if (!parsestate)
|
2006-04-17 13:01:20 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
/* Initialize the lexer. */
|
2010-01-22 13:37:27 +00:00
|
|
|
|
lexstate = grub_script_lexer_init (parsestate, script, getline);
|
|
|
|
|
if (!lexstate)
|
2006-04-17 13:01:20 +00:00
|
|
|
|
{
|
|
|
|
|
grub_free (parsed);
|
|
|
|
|
grub_free (parsestate);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
|
parsestate->lexerstate = lexstate;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
|
membackup = grub_script_mem_record (parsestate);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
|
/* Parse the script. */
|
|
|
|
|
if (grub_script_yyparse (parsestate) || parsestate->err)
|
2005-11-06 22:19:59 +00:00
|
|
|
|
{
|
|
|
|
|
struct grub_script_mem *memfree;
|
2006-04-17 13:01:20 +00:00
|
|
|
|
memfree = grub_script_mem_record_stop (parsestate, membackup);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
grub_script_mem_free (memfree);
|
2010-01-22 13:37:27 +00:00
|
|
|
|
grub_script_lexer_fini (lexstate);
|
2006-04-17 13:01:20 +00:00
|
|
|
|
grub_free (parsestate);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
|
parsed->mem = grub_script_mem_record_stop (parsestate, membackup);
|
|
|
|
|
parsed->cmd = parsestate->parsed;
|
2010-07-21 23:19:05 +00:00
|
|
|
|
parsed->children = parsestate->scripts;
|
2006-04-17 13:01:20 +00:00
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
grub_script_lexer_fini (lexstate);
|
2006-04-17 13:01:20 +00:00
|
|
|
|
grub_free (parsestate);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
|
|
return parsed;
|
|
|
|
|
}
|