merge with mainline

script/argv.c

@@ -20,6 +20,7 @@
 #include <grub/mm.h>
 #include <grub/script_sh.h>
 
+/* Return nearest power of two that is >= v.  */
 static unsigned
 round_up_exp (unsigned v)
 {

script/execute.c

@@ -328,7 +328,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
   struct grub_script_argv argv = { 0, 0 };
 
   /* Lookup the command.  */
-  if (grub_script_arglist_to_argv (cmdline->arglist, &argv))
+  if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args[0])
     return grub_errno;
 
   cmdname = argv.args[0];

script/yylex.l

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