merged mainline

diff --cc include/grub/script_sh.h
Simple merge

diff --cc script/execute.c
index cdfe4733793252997108ee22a4b8dc5cf471297a,6b382e73af0e622dc58adafe3fb8c2634972721b..40f1612678f880f95f0d9cc07a9cc59c305e0a8b
--- 1/script/execute.c
--- 2/script/execute.c
+++ b/script/execute.c
@@@ -39,13 -32,12 +39,16 @@@ grub_script_execute_cmd (struct grub_sc
    if (cmd == 0)
      return 0;
  
 -  return cmd->exec (cmd);
 +  ret = cmd->exec (cmd);
 +
 +  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", ret);
 +  grub_env_set ("?", errnobuf);
 +  return ret;
  }
  
+ #define ARG_ALLOCATION_UNIT  (32 * sizeof (char))
+ #define ARGV_ALLOCATION_UNIT (8 * sizeof (void*))
+ 
  /* Expand arguments in ARGLIST into multiple arguments.  */
  char **
  grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count)

diff --cc script/parser.y
Simple merge

diff --cc util/grub-script-check.c
Simple merge