merge with mainline

This commit is contained in:
BVK Chaitanya 2010-08-12 09:01:59 +05:30
commit 0bcbae0fa7
61 changed files with 3931 additions and 1438 deletions

View file

@ -207,7 +207,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
/* Lookup the command. */
args = grub_script_execute_arglist_to_argv (cmdline->arglist, &argcount);
if (!args)
if (! args || ! args[0])
return grub_errno;
cmdname = args[0];

View file

@ -116,7 +116,7 @@ COMMENT #.*$
CHAR [^{}|&$;<> \t\n\'\"\\]
DIGITS [[:digit:]]+
NAME [[:alpha:]_][[:alnum:][:digit:]_]*
NAME [[:alpha:]_][[:alnum:]_]*
ESC \\.
VARIABLE ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}