merge with mainline

diff --cc Makefile.util.def
index ca092a5,6dfd930..3198581
--- 1/Makefile.util.def
--- 2/Makefile.util.def
+++ b/Makefile.util.def
@@@ -496,12 -501,12 +501,18 @@@ script = 
    common = tests/grub_script_shift.in;
  };
  
+ script = {
+   testcase;
+   name = grub_script_blockarg;
+   common = tests/grub_script_blockarg.in;
+ };
+ 
 +script = {
 +  testcase;
 +  name = grub_script_expansion;
 +  common = tests/grub_script_expansion.in;
 +};
 +
  program = {
    testcase;
    name = example_unit_test;

diff --cc grub-core/Makefile.core.def
Simple merge

diff --cc grub-core/script/argv.c
Simple merge

diff --cc grub-core/script/execute.c
index 056110f,743b315..e6be1fa
--- 1/grub-core/script/execute.c
--- 2/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@@ -225,30 -223,8 +226,30 @@@ grub_script_arglist_to_argv (struct gru
    int i;
    char **values = 0;
    struct grub_script_arg *arg = 0;
-   struct grub_script_argv result = { 0, 0 };
+   struct grub_script_argv result = { 0, 0, 0 };
  
 +  auto int append (char *s, int escape_type);
 +  int append (char *s, int escape_type)
 +  {
 +    int r;
 +    char *p = 0;
 +
 +    if (! grub_wildcard_translator || escape_type == 0)
 +      return grub_script_argv_append (&result, s);
 +
 +    if (escape_type > 0)
 +      p = grub_wildcard_translator->escape (s);
 +    else if (escape_type < 0)
 +      p = grub_wildcard_translator->unescape (s);
 +
 +    if (! p)
 +      return 1;
 +
 +    r = grub_script_argv_append (&result, p);
 +    grub_free (p);
 +    return r;
 +  }
 +
    for (; arglist && arglist->arg; arglist = arglist->next)
      {
        if (grub_script_argv_next (&result))

diff --cc include/grub/script_sh.h
index e33739b,7952fff..98c4b85
--- 1/include/grub/script_sh.h
--- 2/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@@ -69,18 -78,9 +78,19 @@@ struct grub_script_arg
  {
    unsigned argc;
    char **args;
+   struct grub_script *script;
  };
  
- extern struct grub_script_wildcard_translator *grub_filename_translator;
 +/* Pluggable wildcard translator.  */
 +struct grub_script_wildcard_translator
 +{
 +  char *(*escape) (const char *str);
 +  char *(*unescape) (const char *str);
 +  grub_err_t (*expand) (const char *str, char ***expansions);
 +};
 +extern struct grub_script_wildcard_translator *grub_wildcard_translator;
++extern struct grub_script_wildcard_translator grub_filename_translator;
 +
  /* A complete argument.  It consists of a list of one or more `struct
     grub_script_arg's.  */
  struct grub_script_arglist

diff --cc tests/util/grub-shell.in
Simple merge