merge with mainline

diff --cc conf/tests.rmk
index a7fdf403307ddf563e9c7674ab5378e1b312a48a,c14fe0fdaf9dc6485efc136e1522be4d9ce2ac8a..537b7316322ae3c33df53f1ffe19ba3e5e4c1386
--- 1/conf/tests.rmk
--- 2/conf/tests.rmk
+++ b/conf/tests.rmk
@@@ -79,9 -74,15 +79,18 @@@ grub_script_comments_SOURCES = tests/gr
  check_SCRIPTS += grub_script_functions
  grub_script_functions_SOURCES = tests/grub_script_functions.in
  
+ check_SCRIPTS += grub_script_break
+ grub_script_break_SOURCES = tests/grub_script_break.in
+ 
+ check_SCRIPTS += grub_script_continue
+ grub_script_continue_SOURCES = tests/grub_script_continue.in
+ 
+ check_SCRIPTS += grub_script_shift
+ grub_script_shift_SOURCES = tests/grub_script_shift.in
+ 
 +check_SCRIPTS += grub_script_blockarg
 +grub_script_blockarg_SOURCES = tests/grub_script_blockarg.in
 +
  # List of tests to execute on "make check"
  # SCRIPTED_TESTS    = example_scripted_test
  # SCRIPTED_TESTS   += example_grub_script_test
@@@ -99,7 -100,9 +108,10 @@@ SCRIPTED_TESTS += grub_script_final_sem
  SCRIPTED_TESTS += grub_script_dollar
  SCRIPTED_TESTS += grub_script_comments
  SCRIPTED_TESTS += grub_script_functions
+ SCRIPTED_TESTS += grub_script_break
+ SCRIPTED_TESTS += grub_script_continue
+ SCRIPTED_TESTS += grub_script_shift
 +SCRIPTED_TESTS += grub_script_blockarg
  
  # dependencies between tests and testing-tools
  $(SCRIPTED_TESTS): grub-shell grub-shell-tester

diff --cc include/grub/script_sh.h
index 6a959e16f8aeb0ae2cc759725bdca648b83105fd,77e8073600ca70a303131d13e8e026738f6511a8..4ce873e324a00906ff296d686582c366861be6a6
--- 1/include/grub/script_sh.h
--- 2/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@@ -235,8 -223,9 +236,11 @@@ struct grub_parser_para
    struct grub_lexer_param *lexerstate;
  };
  
+ void grub_script_init (void);
+ void grub_script_fini (void);
+ 
 +void grub_script_mem_free (struct grub_script_mem *mem);
 +
  void grub_script_argv_free    (struct grub_script_argv *argv);
  int grub_script_argv_next     (struct grub_script_argv *argv);
  int grub_script_argv_append   (struct grub_script_argv *argv, const char *s);

diff --cc script/argv.c
index 63b44e322a594014d55ae7080cf656190ca7e6fd,b69ee39c57be092dbbe358cf9879a0fc16bf98fe..92449138bc25e04f47fa3853784b5334e6b3a8b0
--- 1/script/argv.c
--- 2/script/argv.c
+++ b/script/argv.c
@@@ -18,9 -18,9 +18,10 @@@
   */
  
  #include <grub/mm.h>
 +#include <grub/misc.h>
  #include <grub/script_sh.h>
  
+ /* Return nearest power of two that is >= v.  */
  static unsigned
  round_up_exp (unsigned v)
  {
@@@ -52,9 -52,9 +53,10 @@@ grub_script_argv_free (struct grub_scri
  
        grub_free (argv->args);
      }
+ 
    argv->argc = 0;
    argv->args = 0;
 +  argv->script = 0;
  }
  
  /* Prepare for next argc.  */

diff --cc script/execute.c
Simple merge

diff --cc script/main.c
Simple merge