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

2006-04-30 Marco Gerards <marco@gnu.org>

Browse source 
* normal/execute.c (grub_script_execute_cmd): Change the return
	type to `grub_err_t'.  Correctly return the error.
	(grub_script_execute_cmdline): In case a command line is not a
	command or a function, try to interpret it as an assignment.
This commit is contained in:
marco_g 2006-04-30 20:29:51 +00:00
parent f85934bd9b
commit df5341da9e
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-04-30 Marco Gerards <marco@gnu.org>
* normal/execute.c (grub_script_execute_cmd): Change the return
type to `grub_err_t'. Correctly return the error.
(grub_script_execute_cmdline): In case a command line is not a
command or a function, try to interpret it as an assignment.
2006-04-30 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-30 Yoshinori K. Okuji <okuji@enbug.org>
* fs/hfsplus.c (grub_hfsplus_read_block): Fixed a memory leak. * fs/hfsplus.c (grub_hfsplus_read_block): Fixed a memory leak.

24
normal/execute.c
View file

@ -25,14 +25,13 @@
#include <grub/env.h> #include <grub/env.h>
#include <grub/script.h> #include <grub/script.h>
static int static grub_err_t
grub_script_execute_cmd (struct grub_script_cmd *cmd) grub_script_execute_cmd (struct grub_script_cmd *cmd)
{ {
if (cmd == 0) if (cmd == 0)
return 0; return 0;
cmd->exec (cmd);
return 0; return cmd->exec (cmd);
} }
/* Parse ARG and return the textual representation. Add strings are /* Parse ARG and return the textual representation. Add strings are
@ -104,7 +103,24 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
/* It's not a GRUB command, try all functions. */ /* It's not a GRUB command, try all functions. */
func = grub_script_function_find (cmdline->cmdname); func = grub_script_function_find (cmdline->cmdname);
if (! func) if (! func)
return 0; {
/* As a last resort, try if it is an assignment. */
char *assign = grub_strdup (cmdline->cmdname);
char *eq = grub_strchr (assign, '=');
if (eq)
{
/* Create two strings and set the variable. */
*eq = '\0';
eq++;
grub_env_set (assign, eq);
/* This was set because the command was not found. */
grub_errno = GRUB_ERR_NONE;
}
grub_free (assign);
return 0;
}
} }
if (cmdline->arglist) if (cmdline->arglist)