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
|
|
|
|
/* normal_parser.h */
|
2005-11-06 22:19:59 +00:00
|
|
|
|
/*
|
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2010-01-22 13:37:27 +00:00
|
|
|
|
* Copyright (C) 2005,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
|
|
|
|
*/
|
2006-01-17 09:50:47 +00:00
|
|
|
|
|
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
|
|
|
|
#ifndef GRUB_NORMAL_PARSER_HEADER
|
|
|
|
|
#define GRUB_NORMAL_PARSER_HEADER 1
|
2006-01-17 09:50:47 +00:00
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
#include <grub/types.h>
|
|
|
|
|
#include <grub/err.h>
|
2006-04-17 13:01:20 +00:00
|
|
|
|
#include <grub/parser.h>
|
2010-05-07 04:38:09 +00:00
|
|
|
|
#include <grub/command.h>
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
|
|
struct grub_script_mem;
|
|
|
|
|
|
|
|
|
|
/* The generic header for each scripting command or structure. */
|
|
|
|
|
struct grub_script_cmd
|
|
|
|
|
{
|
|
|
|
|
/* This function is called to execute the command. */
|
|
|
|
|
grub_err_t (*exec) (struct grub_script_cmd *cmd);
|
|
|
|
|
|
|
|
|
|
/* The next command. This can be used by the parent to form a chain
|
|
|
|
|
of commands. */
|
|
|
|
|
struct grub_script_cmd *next;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct grub_script
|
|
|
|
|
{
|
2010-06-10 15:19:57 +00:00
|
|
|
|
unsigned refcnt;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
struct grub_script_mem *mem;
|
|
|
|
|
struct grub_script_cmd *cmd;
|
2010-07-21 23:19:05 +00:00
|
|
|
|
|
2010-08-09 16:12:24 +00:00
|
|
|
|
/* grub_scripts from block arguments. */
|
|
|
|
|
struct grub_script *next_siblings;
|
2010-07-21 23:19:05 +00:00
|
|
|
|
struct grub_script *children;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
typedef enum
|
|
|
|
|
{
|
2010-01-22 13:37:27 +00:00
|
|
|
|
GRUB_SCRIPT_ARG_TYPE_VAR,
|
|
|
|
|
GRUB_SCRIPT_ARG_TYPE_TEXT,
|
|
|
|
|
GRUB_SCRIPT_ARG_TYPE_DQVAR,
|
|
|
|
|
GRUB_SCRIPT_ARG_TYPE_DQSTR,
|
2010-04-30 06:39:31 +00:00
|
|
|
|
GRUB_SCRIPT_ARG_TYPE_SQSTR,
|
|
|
|
|
GRUB_SCRIPT_ARG_TYPE_BLOCK
|
2005-11-06 22:19:59 +00:00
|
|
|
|
} grub_script_arg_type_t;
|
|
|
|
|
|
|
|
|
|
/* A part of an argument. */
|
|
|
|
|
struct grub_script_arg
|
|
|
|
|
{
|
|
|
|
|
grub_script_arg_type_t type;
|
|
|
|
|
|
|
|
|
|
char *str;
|
|
|
|
|
|
2010-04-30 06:39:31 +00:00
|
|
|
|
/* Parsed block argument. */
|
2010-07-20 22:17:30 +00:00
|
|
|
|
struct grub_script *script;
|
2010-04-30 06:39:31 +00:00
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
/* Next argument part. */
|
|
|
|
|
struct grub_script_arg *next;
|
|
|
|
|
};
|
|
|
|
|
|
2010-05-12 04:49:12 +00:00
|
|
|
|
/* An argument vector. */
|
|
|
|
|
struct grub_script_argv
|
|
|
|
|
{
|
2010-05-19 04:55:41 +00:00
|
|
|
|
unsigned argc;
|
2010-05-12 04:49:12 +00:00
|
|
|
|
char **args;
|
2010-07-20 22:17:30 +00:00
|
|
|
|
struct grub_script *script;
|
2010-05-12 04:49:12 +00:00
|
|
|
|
};
|
|
|
|
|
|
2010-07-29 17:22:09 +00:00
|
|
|
|
/* Pluggable wildcard translator. */
|
|
|
|
|
struct grub_script_wildcard_translator
|
|
|
|
|
{
|
|
|
|
|
char *(*escape) (const char *str);
|
|
|
|
|
char *(*unescape) (const char *str);
|
|
|
|
|
grub_err_t (*expand) (const char *str, char ***expansions);
|
|
|
|
|
};
|
2010-09-03 15:05:23 +00:00
|
|
|
|
extern struct grub_script_wildcard_translator *grub_wildcard_translator;
|
2010-09-04 06:19:02 +00:00
|
|
|
|
extern struct grub_script_wildcard_translator grub_filename_translator;
|
2010-07-29 17:22:09 +00:00
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
/* A complete argument. It consists of a list of one or more `struct
|
|
|
|
|
grub_script_arg's. */
|
|
|
|
|
struct grub_script_arglist
|
|
|
|
|
{
|
|
|
|
|
struct grub_script_arglist *next;
|
|
|
|
|
struct grub_script_arg *arg;
|
|
|
|
|
/* Only stored in the first link. */
|
|
|
|
|
int argcount;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* A single command line. */
|
|
|
|
|
struct grub_script_cmdline
|
|
|
|
|
{
|
|
|
|
|
struct grub_script_cmd cmd;
|
|
|
|
|
|
|
|
|
|
/* The arguments for this command. */
|
|
|
|
|
struct grub_script_arglist *arglist;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* An if statement. */
|
|
|
|
|
struct grub_script_cmdif
|
|
|
|
|
{
|
|
|
|
|
struct grub_script_cmd cmd;
|
|
|
|
|
|
2006-05-28 21:58:35 +00:00
|
|
|
|
/* The command used to check if the 'if' is true or false. */
|
|
|
|
|
struct grub_script_cmd *exec_to_evaluate;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
2006-05-28 21:58:35 +00:00
|
|
|
|
/* The code executed in case the result of 'if' was true. */
|
|
|
|
|
struct grub_script_cmd *exec_on_true;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
2006-05-28 21:58:35 +00:00
|
|
|
|
/* The code executed in case the result of 'if' was false. */
|
|
|
|
|
struct grub_script_cmd *exec_on_false;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
};
|
|
|
|
|
|
2010-01-23 05:33:41 +00:00
|
|
|
|
/* A for statement. */
|
|
|
|
|
struct grub_script_cmdfor
|
|
|
|
|
{
|
|
|
|
|
struct grub_script_cmd cmd;
|
|
|
|
|
|
|
|
|
|
/* The name used as looping variable. */
|
|
|
|
|
struct grub_script_arg *name;
|
|
|
|
|
|
|
|
|
|
/* The words loop iterates over. */
|
|
|
|
|
struct grub_script_arglist *words;
|
|
|
|
|
|
|
|
|
|
/* The command list executed in each loop. */
|
|
|
|
|
struct grub_script_cmd *list;
|
|
|
|
|
};
|
|
|
|
|
|
2010-01-23 05:49:26 +00:00
|
|
|
|
/* A while/until command. */
|
|
|
|
|
struct grub_script_cmdwhile
|
|
|
|
|
{
|
|
|
|
|
struct grub_script_cmd cmd;
|
|
|
|
|
|
|
|
|
|
/* The command list used as condition. */
|
|
|
|
|
struct grub_script_cmd *cond;
|
|
|
|
|
|
|
|
|
|
/* The command list executed in each loop. */
|
|
|
|
|
struct grub_script_cmd *list;
|
|
|
|
|
|
|
|
|
|
/* The flag to indicate this as "until" loop. */
|
|
|
|
|
int until;
|
|
|
|
|
};
|
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
|
/* State of the lexer as passed to the lexer. */
|
|
|
|
|
struct grub_lexer_param
|
|
|
|
|
{
|
|
|
|
|
/* Function used by the lexer to get a new line when more input is
|
|
|
|
|
expected, but not available. */
|
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_reader_getline_t getline;
|
2006-04-17 13:01:20 +00:00
|
|
|
|
|
|
|
|
|
/* A reference counter. If this is >0 it means that the parser
|
|
|
|
|
expects more tokens and `getline' should be called to fetch more.
|
|
|
|
|
Otherwise the lexer can stop processing if the current buffer is
|
|
|
|
|
depleted. */
|
|
|
|
|
int refs;
|
|
|
|
|
|
|
|
|
|
/* While walking through the databuffer, `record' the characters to
|
|
|
|
|
this other buffer. It can be used to edit the menu entry at a
|
|
|
|
|
later moment. */
|
|
|
|
|
|
|
|
|
|
/* If true, recording is enabled. */
|
|
|
|
|
int record;
|
|
|
|
|
|
|
|
|
|
/* Points to the recording. */
|
|
|
|
|
char *recording;
|
|
|
|
|
|
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
|
|
|
|
/* index in the RECORDING. */
|
2006-04-17 13:01:20 +00:00
|
|
|
|
int recordpos;
|
|
|
|
|
|
|
|
|
|
/* Size of RECORDING. */
|
|
|
|
|
int recordlen;
|
2009-06-04 16:18:35 +00:00
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
/* End of file reached. */
|
|
|
|
|
int eof;
|
|
|
|
|
|
|
|
|
|
/* Merge multiple word tokens. */
|
|
|
|
|
int merge_start;
|
|
|
|
|
int merge_end;
|
|
|
|
|
|
2010-01-22 18:44:00 +00:00
|
|
|
|
/* Part of a multi-part token. */
|
2010-01-22 13:37:27 +00:00
|
|
|
|
char *text;
|
2010-01-22 18:44:00 +00:00
|
|
|
|
unsigned used;
|
|
|
|
|
unsigned size;
|
2009-06-17 13:47:37 +00:00
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
/* Type of text. */
|
|
|
|
|
grub_script_arg_type_t type;
|
|
|
|
|
|
2010-06-12 05:36:02 +00:00
|
|
|
|
/* Flag to indicate resplit in progres. */
|
|
|
|
|
unsigned resplit;
|
|
|
|
|
|
|
|
|
|
/* Text that is unput. */
|
|
|
|
|
char *prefix;
|
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
/* Flex scanner. */
|
|
|
|
|
void *yyscanner;
|
|
|
|
|
|
|
|
|
|
/* Flex scanner buffer. */
|
|
|
|
|
void *buffer;
|
2006-04-17 13:01:20 +00:00
|
|
|
|
};
|
|
|
|
|
|
2010-01-22 19:12:55 +00:00
|
|
|
|
#define GRUB_LEXER_INITIAL_TEXT_SIZE 32
|
|
|
|
|
#define GRUB_LEXER_INITIAL_RECORD_SIZE 256
|
2010-01-22 13:37:27 +00:00
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
|
/* State of the parser as passes to the parser. */
|
|
|
|
|
struct grub_parser_param
|
|
|
|
|
{
|
|
|
|
|
/* Keep track of the memory allocated for this specific
|
|
|
|
|
function. */
|
|
|
|
|
struct grub_script_mem *func_mem;
|
|
|
|
|
|
2009-05-04 20:06:05 +00:00
|
|
|
|
/* When set to 0, no errors have occurred during parsing. */
|
2006-04-17 13:01:20 +00:00
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
/* The memory that was used while parsing and scanning. */
|
|
|
|
|
struct grub_script_mem *memused;
|
|
|
|
|
|
2010-07-21 23:19:05 +00:00
|
|
|
|
/* The block argument scripts. */
|
|
|
|
|
struct grub_script *scripts;
|
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
|
/* The result of the parser. */
|
|
|
|
|
struct grub_script_cmd *parsed;
|
|
|
|
|
|
|
|
|
|
struct grub_lexer_param *lexerstate;
|
|
|
|
|
};
|
|
|
|
|
|
2010-06-12 15:06:46 +00:00
|
|
|
|
void grub_script_init (void);
|
|
|
|
|
void grub_script_fini (void);
|
|
|
|
|
|
2010-06-10 15:19:57 +00:00
|
|
|
|
void grub_script_mem_free (struct grub_script_mem *mem);
|
|
|
|
|
|
2010-05-12 04:49:12 +00:00
|
|
|
|
void grub_script_argv_free (struct grub_script_argv *argv);
|
2010-08-15 06:32:33 +00:00
|
|
|
|
int grub_script_argv_make (struct grub_script_argv *argv, int argc, char **args);
|
2010-05-12 04:49:12 +00:00
|
|
|
|
int grub_script_argv_next (struct grub_script_argv *argv);
|
|
|
|
|
int grub_script_argv_append (struct grub_script_argv *argv, const char *s);
|
|
|
|
|
int grub_script_argv_split_append (struct grub_script_argv *argv, char *s);
|
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
struct grub_script_arglist *
|
2006-04-17 13:01:20 +00:00
|
|
|
|
grub_script_create_arglist (struct grub_parser_param *state);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
|
|
struct grub_script_arglist *
|
2006-04-17 13:01:20 +00:00
|
|
|
|
grub_script_add_arglist (struct grub_parser_param *state,
|
|
|
|
|
struct grub_script_arglist *list,
|
2005-11-06 22:19:59 +00:00
|
|
|
|
struct grub_script_arg *arg);
|
|
|
|
|
struct grub_script_cmd *
|
2006-04-17 13:01:20 +00:00
|
|
|
|
grub_script_create_cmdline (struct grub_parser_param *state,
|
2005-11-06 22:19:59 +00:00
|
|
|
|
struct grub_script_arglist *arglist);
|
|
|
|
|
|
|
|
|
|
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);
|
2006-01-17 09:50:47 +00:00
|
|
|
|
|
2010-01-23 05:33:41 +00:00
|
|
|
|
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);
|
|
|
|
|
|
2010-01-23 05:49:26 +00:00
|
|
|
|
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);
|
|
|
|
|
|
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
|
|
|
|
struct grub_script_arg *
|
2006-04-17 13:01:20 +00:00
|
|
|
|
grub_script_arg_add (struct grub_parser_param *state,
|
|
|
|
|
struct grub_script_arg *arg,
|
2005-11-06 22:19:59 +00:00
|
|
|
|
grub_script_arg_type_t type, char *str);
|
|
|
|
|
|
|
|
|
|
struct grub_script *grub_script_parse (char *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_reader_getline_t getline);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
void grub_script_free (struct grub_script *script);
|
|
|
|
|
struct grub_script *grub_script_create (struct grub_script_cmd *cmd,
|
|
|
|
|
struct grub_script_mem *mem);
|
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
struct grub_lexer_param *grub_script_lexer_init (struct grub_parser_param *parser,
|
|
|
|
|
char *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_reader_getline_t getline);
|
2010-01-22 13:37:27 +00:00
|
|
|
|
void grub_script_lexer_fini (struct grub_lexer_param *);
|
2006-04-17 13:01:20 +00:00
|
|
|
|
void grub_script_lexer_ref (struct grub_lexer_param *);
|
|
|
|
|
void grub_script_lexer_deref (struct grub_lexer_param *);
|
2010-04-29 12:40:22 +00:00
|
|
|
|
unsigned grub_script_lexer_record_start (struct grub_parser_param *);
|
|
|
|
|
char *grub_script_lexer_record_stop (struct grub_parser_param *, unsigned);
|
2010-06-12 05:36:02 +00:00
|
|
|
|
int grub_script_lexer_yywrap (struct grub_parser_param *, const char *input);
|
2010-01-22 13:37:27 +00:00
|
|
|
|
void grub_script_lexer_record (struct grub_parser_param *, char *);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
|
|
/* Functions to track allocated memory. */
|
2006-04-17 13:01:20 +00:00
|
|
|
|
struct grub_script_mem *grub_script_mem_record (struct grub_parser_param *state);
|
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
|
|
|
|
struct grub_script_mem *grub_script_mem_record_stop (struct grub_parser_param *state,
|
2006-04-17 13:01:20 +00:00
|
|
|
|
struct grub_script_mem *restore);
|
|
|
|
|
void *grub_script_malloc (struct grub_parser_param *state, grub_size_t size);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
|
|
/* Functions used by bison. */
|
2008-05-30 03:26:56 +00:00
|
|
|
|
union YYSTYPE;
|
|
|
|
|
int grub_script_yylex (union YYSTYPE *, struct grub_parser_param *);
|
2006-04-17 13:01:20 +00:00
|
|
|
|
int grub_script_yyparse (struct grub_parser_param *);
|
|
|
|
|
void grub_script_yyerror (struct grub_parser_param *, char const *);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
|
|
/* Commands to execute, don't use these directly. */
|
|
|
|
|
grub_err_t grub_script_execute_cmdline (struct grub_script_cmd *cmd);
|
2010-05-05 08:35:06 +00:00
|
|
|
|
grub_err_t grub_script_execute_cmdlist (struct grub_script_cmd *cmd);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
grub_err_t grub_script_execute_cmdif (struct grub_script_cmd *cmd);
|
2010-01-23 05:33:41 +00:00
|
|
|
|
grub_err_t grub_script_execute_cmdfor (struct grub_script_cmd *cmd);
|
2010-01-23 05:49:26 +00:00
|
|
|
|
grub_err_t grub_script_execute_cmdwhile (struct grub_script_cmd *cmd);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
|
|
/* Execute any GRUB pre-parsed command or script. */
|
|
|
|
|
grub_err_t grub_script_execute (struct grub_script *script);
|
2010-07-22 15:45:14 +00:00
|
|
|
|
grub_err_t grub_script_execute_sourcecode (const char *source, int argc, char **args);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
2010-05-05 10:04:26 +00:00
|
|
|
|
/* Break command for loops. */
|
|
|
|
|
grub_err_t grub_script_break (grub_command_t cmd, int argc, char *argv[]);
|
|
|
|
|
|
2010-05-07 04:38:09 +00:00
|
|
|
|
/* SHIFT command for GRUB script. */
|
2010-06-13 04:18:47 +00:00
|
|
|
|
grub_err_t grub_script_shift (grub_command_t cmd, int argc, char *argv[]);
|
2010-05-07 04:38:09 +00:00
|
|
|
|
|
2010-08-15 06:32:33 +00:00
|
|
|
|
/* SETPARAMS command for GRUB script functions. */
|
|
|
|
|
grub_err_t grub_script_setparams (grub_command_t cmd, int argc, char *argv[]);
|
|
|
|
|
|
2010-08-25 14:05:52 +00:00
|
|
|
|
/* RETURN command for functions. */
|
|
|
|
|
grub_err_t grub_script_return (grub_command_t cmd, int argc, char *argv[]);
|
|
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
|
/* This variable points to the parsed command. This is used to
|
|
|
|
|
communicate with the bison code. */
|
|
|
|
|
extern struct grub_script_cmd *grub_script_parsed;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The function description. */
|
|
|
|
|
struct grub_script_function
|
|
|
|
|
{
|
|
|
|
|
/* The name. */
|
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
|
|
/* The script function. */
|
|
|
|
|
struct grub_script *func;
|
|
|
|
|
|
|
|
|
|
/* The flags. */
|
|
|
|
|
unsigned flags;
|
|
|
|
|
|
|
|
|
|
/* The next element. */
|
|
|
|
|
struct grub_script_function *next;
|
|
|
|
|
|
|
|
|
|
int references;
|
|
|
|
|
};
|
|
|
|
|
typedef struct grub_script_function *grub_script_function_t;
|
|
|
|
|
|
2010-03-26 23:58:35 +00:00
|
|
|
|
extern grub_script_function_t grub_script_function_list;
|
|
|
|
|
|
|
|
|
|
#define FOR_SCRIPT_FUNCTIONS(var) for((var) = grub_script_function_list; \
|
|
|
|
|
(var); (var) = (var)->next)
|
|
|
|
|
|
2009-06-04 16:18:35 +00:00
|
|
|
|
grub_script_function_t grub_script_function_create (struct grub_script_arg *functionname,
|
2005-11-06 22:19:59 +00:00
|
|
|
|
struct grub_script *cmd);
|
|
|
|
|
void grub_script_function_remove (const char *name);
|
|
|
|
|
grub_script_function_t grub_script_function_find (char *functionname);
|
2010-06-12 11:02:06 +00:00
|
|
|
|
|
2010-05-05 09:17:50 +00:00
|
|
|
|
grub_err_t grub_script_function_call (grub_script_function_t func,
|
|
|
|
|
int argc, char **args);
|
2006-01-17 09:50:47 +00:00
|
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
|
char **
|
2010-01-23 03:42:46 +00:00
|
|
|
|
grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count);
|
2009-06-04 16:18:35 +00:00
|
|
|
|
|
2010-03-26 23:19:42 +00:00
|
|
|
|
grub_err_t
|
|
|
|
|
grub_normal_parse_line (char *line, grub_reader_getline_t getline);
|
|
|
|
|
|
2010-06-10 15:19:57 +00:00
|
|
|
|
static inline struct grub_script *
|
2010-08-09 16:12:24 +00:00
|
|
|
|
grub_script_ref (struct grub_script *script)
|
2010-06-10 15:19:57 +00:00
|
|
|
|
{
|
2010-07-21 23:19:05 +00:00
|
|
|
|
if (script)
|
|
|
|
|
script->refcnt++;
|
2010-06-10 15:19:57 +00:00
|
|
|
|
return script;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void
|
2010-08-09 16:12:24 +00:00
|
|
|
|
grub_script_unref (struct grub_script *script)
|
2010-06-10 15:19:57 +00:00
|
|
|
|
{
|
2010-07-21 23:19:05 +00:00
|
|
|
|
if (! script)
|
|
|
|
|
return;
|
|
|
|
|
|
2010-06-10 15:19:57 +00:00
|
|
|
|
if (script->refcnt == 0)
|
|
|
|
|
grub_script_free (script);
|
|
|
|
|
else
|
|
|
|
|
script->refcnt--;
|
|
|
|
|
}
|
|
|
|
|
|
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
|
|
|
|
#endif /* ! GRUB_NORMAL_PARSER_HEADER */
|