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

2006-05-29 Vesa Jaaskelainen <chaac@nic.fi>

Browse source 
* include/grub/script.h (grub_script_cmdif): Renamed field 'bool' to
        'exec_to_evaluate'.  Renamed field 'true' to 'exec_on_true'.  Renamed
        field 'false' to 'exec_on_false'.
        (grub_script_create_cmdif): Renamed argument names to reflect above
        changes.

        * normal/execute.c (grub_script_execute_cmdif): Likewise.

        * normal/script.c (grub_script_create_cmdif): Likewise.
This commit is contained in:
chaac 2006-05-28 21:58:35 +00:00
parent 118f4fb31e
commit f09771a102
4 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2006-05-29 Vesa Jaaskelainen <chaac@nic.fi>
* include/grub/script.h (grub_script_cmdif): Renamed field 'bool' to
'exec_to_evaluate'. Renamed field 'true' to 'exec_on_true'. Renamed
field 'false' to 'exec_on_false'.
(grub_script_create_cmdif): Renamed argument names to reflect above
changes.
* normal/execute.c (grub_script_execute_cmdif): Likewise.
* normal/script.c (grub_script_create_cmdif): Likewise.
2006-05-28 Yoshinori K. Okuji <okuji@enbug.org> 2006-05-28 Yoshinori K. Okuji <okuji@enbug.org>
* fs/hfsplus.c (grub_hfsplus_btree_recoffset): Moved to near the * fs/hfsplus.c (grub_hfsplus_btree_recoffset): Moved to near the

18
include/grub/script.h
View file

@ -100,14 +100,14 @@ struct grub_script_cmdif
{ {
struct grub_script_cmd cmd; struct grub_script_cmd cmd;
/* The command used to check if the if is true or false. */ /* The command used to check if the 'if' is true or false. */
struct grub_script_cmd *bool; struct grub_script_cmd *exec_to_evaluate;
/* The code executed in case the result if bool was true. */ /* The code executed in case the result of 'if' was true. */
struct grub_script_cmd *true; struct grub_script_cmd *exec_on_true;
/* The code executed in case the result if bool was false. */ /* The code executed in case the result of 'if' was false. */
struct grub_script_cmd *false; struct grub_script_cmd *exec_on_false;
}; };
/* A menu entry generate statement. */ /* A menu entry generate statement. */
@ -200,9 +200,9 @@ grub_script_create_cmdblock (struct grub_parser_param *state);
struct grub_script_cmd * struct grub_script_cmd *
grub_script_create_cmdif (struct grub_parser_param *state, grub_script_create_cmdif (struct grub_parser_param *state,
struct grub_script_cmd *bool, struct grub_script_cmd *exec_to_evaluate,
struct grub_script_cmd *true, struct grub_script_cmd *exec_on_true,
struct grub_script_cmd *false); struct grub_script_cmd *exec_on_false);
struct grub_script_cmd * struct grub_script_cmd *
grub_script_create_cmdmenu (struct grub_parser_param *state, grub_script_create_cmdmenu (struct grub_parser_param *state,

16
normal/execute.c
View file

@ -192,19 +192,19 @@ grub_err_t
grub_script_execute_cmdif (struct grub_script_cmd *cmd) grub_script_execute_cmdif (struct grub_script_cmd *cmd)
{ {
struct grub_script_cmdif *cmdif = (struct grub_script_cmdif *) cmd; struct grub_script_cmdif *cmdif = (struct grub_script_cmdif *) cmd;
char *bool; char *result;
/* Check if the commands results in a true or a false. The value is /* Check if the commands results in a true or a false. The value is
read from the env variable `RESULT'. */ read from the env variable `?'. */
grub_script_execute_cmd (cmdif->bool); grub_script_execute_cmd (cmdif->exec_to_evaluate);
bool = grub_env_get ("?"); result = grub_env_get ("?");
/* Execute the `if' or the `else' part depending on the value of /* Execute the `if' or the `else' part depending on the value of
`RESULT'. */ `?'. */
if (bool && ! grub_strcmp (bool, "0")) if (result && ! grub_strcmp (result, "0"))
return grub_script_execute_cmd (cmdif->true); return grub_script_execute_cmd (cmdif->exec_on_true);
else else
return grub_script_execute_cmd (cmdif->false); return grub_script_execute_cmd (cmdif->exec_on_false);
} }
/* Execute the menu entry generate statement. */ /* Execute the menu entry generate statement. */

14
normal/script.c
View file

@ -178,14 +178,14 @@ grub_script_create_cmdline (struct grub_parser_param *state,
} }
/* Create a command that functions as an if statement. If BOOL is /* Create a command that functions as an if statement. If BOOL is
evaluated to true (the value is returned in envvar RESULT), the evaluated to true (the value is returned in envvar '?'), the
interpreter will run the command TRUE, otherwise the interpreter interpreter will run the command TRUE, otherwise the interpreter
runs the command FALSE. */ runs the command FALSE. */
struct grub_script_cmd * struct grub_script_cmd *
grub_script_create_cmdif (struct grub_parser_param *state, grub_script_create_cmdif (struct grub_parser_param *state,
struct grub_script_cmd *bool, struct grub_script_cmd *exec_to_evaluate,
struct grub_script_cmd *true, struct grub_script_cmd *exec_on_true,
struct grub_script_cmd *false) struct grub_script_cmd *exec_on_false)
{ {
struct grub_script_cmdif *cmd; struct grub_script_cmdif *cmd;
@ -194,9 +194,9 @@ grub_script_create_cmdif (struct grub_parser_param *state,
cmd = grub_script_malloc (state, sizeof (*cmd)); cmd = grub_script_malloc (state, sizeof (*cmd));
cmd->cmd.exec = grub_script_execute_cmdif; cmd->cmd.exec = grub_script_execute_cmdif;
cmd->cmd.next = 0; cmd->cmd.next = 0;
cmd->bool = bool; cmd->exec_to_evaluate = exec_to_evaluate;
cmd->true = true; cmd->exec_on_true = exec_on_true;
cmd->false = false; cmd->exec_on_false = exec_on_false;
return (struct grub_script_cmd *) cmd; return (struct grub_script_cmd *) cmd;
} }