pulled in menuentry branch for OPTION_REPEATABLE

include/grub/command.h

@@ -37,6 +37,8 @@
 #define GRUB_COMMAND_FLAG_EXTCMD	0x10
 /* This is an dynamic command.  */
 #define GRUB_COMMAND_FLAG_DYNCMD	0x20
+/* This command accepts block arguments.  */
+#define GRUB_COMMAND_FLAG_BLOCKS	0x40
 
 struct grub_command;
 

include/grub/extcmd.h

@@ -21,10 +21,12 @@
 
 #include <grub/lib/arg.h>
 #include <grub/command.h>
+#include <grub/script_sh.h>
 
 struct grub_extcmd;
+struct grub_extcmd_context;
 
-typedef grub_err_t (*grub_extcmd_func_t) (struct grub_extcmd *cmd,
+typedef grub_err_t (*grub_extcmd_func_t) (struct grub_extcmd_context *ctxt,
 					  int argc, char **args);
 
 /* The argcmd description.  */
@@ -38,11 +40,21 @@ struct grub_extcmd
   const struct grub_arg_option *options;
 
   void *data;
-
-  struct grub_arg_list *state;
 };
 typedef struct grub_extcmd *grub_extcmd_t;
 
+/* Command context for each instance of execution.  */
+struct grub_extcmd_context
+{
+  struct grub_extcmd *extcmd;
+
+  struct grub_arg_list *state;
+
+  /* Script parameter, if any.  */
+  struct grub_script *script;
+};
+typedef struct grub_extcmd_context *grub_extcmd_context_t;
+
 grub_extcmd_t grub_register_extcmd (const char *name,
 				    grub_extcmd_func_t func,
 				    unsigned flags,
@@ -50,6 +62,18 @@ grub_extcmd_t grub_register_extcmd (const char *name,
 				    const char *description,
 				    const struct grub_arg_option *parser);
 
+grub_extcmd_t grub_register_extcmd_prio (const char *name,
+					 grub_extcmd_func_t func,
+					 unsigned flags,
+					 const char *summary,
+					 const char *description,
+					 const struct grub_arg_option *parser,
+					 int prio);
+
 void grub_unregister_extcmd (grub_extcmd_t cmd);
 
+grub_err_t
+grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
+			struct grub_script *script);
+
 #endif /* ! GRUB_EXTCMD_HEADER */

include/grub/lib/arg.h

@@ -38,6 +38,8 @@ typedef enum grub_arg_type grub_arg_type_t;
 
 /* Flags for the option field op grub_arg_option.  */
 #define GRUB_ARG_OPTION_OPTIONAL	(1 << 1)
+/* Flags for an option that can appear multiple times.  */
+#define GRUB_ARG_OPTION_REPEATABLE      (1 << 2)
 
 enum grub_key_type
   {
@@ -59,7 +61,10 @@ struct grub_arg_option
 struct grub_arg_list
 {
   int set;
-  char *arg;
+  union {
+    char *arg;
+    char **args;
+  };
 };
 
 struct grub_extcmd;
@@ -68,5 +73,7 @@ int grub_arg_parse (struct grub_extcmd *cmd, int argc, char **argv,
 		    struct grub_arg_list *usr, char ***args, int *argnum);
 
 void grub_arg_show_help (struct grub_extcmd *cmd);
+struct grub_arg_list* grub_arg_list_alloc (struct grub_extcmd *cmd,
+					   int argc, char *argv[]);
 
 #endif /* ! GRUB_ARG_HEADER */

include/grub/menu.h

@@ -47,6 +47,10 @@ struct grub_menu_entry
   /* The sourcecode of the menu entry, used by the editor.  */
   const char *sourcecode;
 
+  /* Parameters to be passed to menu definition.  */
+  int argc;
+  char **args;
+
   int hotkey;
 
   /* The next element.  */

include/grub/normal.h

@@ -54,8 +54,6 @@ void grub_normal_execute (const char *config, int nested, int batch);
 void grub_menu_init_page (int nested, int edit,
 			  struct grub_term_output *term);
 void grub_normal_init_page (struct grub_term_output *term);
-grub_err_t grub_normal_add_menu_entry (int argc, const char **args,
-				       const char *sourcecode);
 char *grub_file_getline (grub_file_t file);
 void grub_cmdline_run (int nested);
 

include/grub/script_sh.h

@@ -39,8 +39,13 @@ struct grub_script_cmd
 
 struct grub_script
 {
+  unsigned refcnt;
   struct grub_script_mem *mem;
   struct grub_script_cmd *cmd;
+
+  /* Other grub_script's from block arguments.  */
+  struct grub_script *siblings;
+  struct grub_script *children;
 };
 
 typedef enum
@@ -49,7 +54,8 @@ typedef enum
   GRUB_SCRIPT_ARG_TYPE_TEXT,
   GRUB_SCRIPT_ARG_TYPE_DQVAR,
   GRUB_SCRIPT_ARG_TYPE_DQSTR,
-  GRUB_SCRIPT_ARG_TYPE_SQSTR
+  GRUB_SCRIPT_ARG_TYPE_SQSTR,
+  GRUB_SCRIPT_ARG_TYPE_BLOCK
 } grub_script_arg_type_t;
 
 /* A part of an argument.  */
@@ -59,10 +65,21 @@ struct grub_script_arg
 
   char *str;
 
+  /* Parsed block argument.  */
+  struct grub_script *script;
+
   /* Next argument part.  */
   struct grub_script_arg *next;
 };
 
+/* An argument vector.  */
+struct grub_script_argv
+{
+  unsigned argc;
+  char **args;
+  struct grub_script *script;
+};
+
 /* A complete argument.  It consists of a list of one or more `struct
    grub_script_arg's.  */
 struct grub_script_arglist
@@ -82,15 +99,6 @@ struct grub_script_cmdline
   struct grub_script_arglist *arglist;
 };
 
-/* A block of commands, this can be used to group commands.  */
-struct grub_script_cmdblock
-{
-  struct grub_script_cmd cmd;
-
-  /* A chain of commands.  */
-  struct grub_script_cmd *cmdlist;
-};
-
 /* An if statement.  */
 struct grub_script_cmdif
 {
@@ -136,21 +144,6 @@ struct grub_script_cmdwhile
   int until;
 };
 
-/* A menu entry generate statement.  */
-struct grub_script_cmd_menuentry
-{
-  struct grub_script_cmd cmd;
-
-  /* The arguments for this menu entry.  */
-  struct grub_script_arglist *arglist;
-
-  /* The sourcecode the entry will be generated from.  */
-  const char *sourcecode;
-
-  /* Options.  XXX: Not used yet.  */
-  int options;
-};
-
 /* State of the lexer as passed to the lexer.  */
 struct grub_lexer_param
 {
@@ -218,12 +211,22 @@ struct grub_parser_param
   /* The memory that was used while parsing and scanning.  */
   struct grub_script_mem *memused;
 
+  /* The block argument scripts.  */
+  struct grub_script *scripts;
+
   /* The result of the parser.  */
   struct grub_script_cmd *parsed;
 
   struct grub_lexer_param *lexerstate;
 };
 
+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);
+int grub_script_argv_split_append (struct grub_script_argv *argv, char *s);
+
 struct grub_script_arglist *
 grub_script_create_arglist (struct grub_parser_param *state);
 
@@ -234,8 +237,6 @@ grub_script_add_arglist (struct grub_parser_param *state,
 struct grub_script_cmd *
 grub_script_create_cmdline (struct grub_parser_param *state,
 			    struct grub_script_arglist *arglist);
-struct grub_script_cmd *
-grub_script_create_cmdblock (struct grub_parser_param *state);
 
 struct grub_script_cmd *
 grub_script_create_cmdif (struct grub_parser_param *state,
@@ -256,15 +257,9 @@ grub_script_create_cmdwhile (struct grub_parser_param *state,
 			     int is_an_until_loop);
 
 struct grub_script_cmd *
-grub_script_create_cmdmenu (struct grub_parser_param *state,
-			    struct grub_script_arglist *arglist,
-			    char *sourcecode,
-			    int options);
-
-struct grub_script_cmd *
-grub_script_add_cmd (struct grub_parser_param *state,
-		     struct grub_script_cmdblock *cmdblock,
-		     struct grub_script_cmd *cmd);
+grub_script_append_cmd (struct grub_parser_param *state,
+			struct grub_script_cmd *list,
+			struct grub_script_cmd *last);
 struct grub_script_arg *
 grub_script_arg_add (struct grub_parser_param *state,
 		     struct grub_script_arg *arg,
@@ -282,8 +277,8 @@ struct grub_lexer_param *grub_script_lexer_init (struct grub_parser_param *parse
 void grub_script_lexer_fini (struct grub_lexer_param *);
 void grub_script_lexer_ref (struct grub_lexer_param *);
 void grub_script_lexer_deref (struct grub_lexer_param *);
-void grub_script_lexer_record_start (struct grub_parser_param *);
-char *grub_script_lexer_record_stop (struct grub_parser_param *);
+unsigned grub_script_lexer_record_start (struct grub_parser_param *);
+char *grub_script_lexer_record_stop (struct grub_parser_param *, unsigned);
 int  grub_script_lexer_yywrap (struct grub_parser_param *);
 void grub_script_lexer_record (struct grub_parser_param *, char *);
 
@@ -301,14 +296,14 @@ void grub_script_yyerror (struct grub_parser_param *, char const *);
 
 /* Commands to execute, don't use these directly.  */
 grub_err_t grub_script_execute_cmdline (struct grub_script_cmd *cmd);
-grub_err_t grub_script_execute_cmdblock (struct grub_script_cmd *cmd);
+grub_err_t grub_script_execute_cmdlist (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdif (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdfor (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdwhile (struct grub_script_cmd *cmd);
-grub_err_t grub_script_execute_menuentry (struct grub_script_cmd *cmd);
 
 /* Execute any GRUB pre-parsed command or script.  */
 grub_err_t grub_script_execute (struct grub_script *script);
+grub_err_t grub_script_execute_sourcecode (const char *source, int argc, char **args);
 
 /* This variable points to the parsed command.  This is used to
    communicate with the bison code.  */
@@ -344,12 +339,33 @@ grub_script_function_t grub_script_function_create (struct grub_script_arg *func
 						    struct grub_script *cmd);
 void grub_script_function_remove (const char *name);
 grub_script_function_t grub_script_function_find (char *functionname);
-int grub_script_function_call (grub_script_function_t func,
-			       int argc, char **args);
+
+grub_err_t grub_script_function_call (grub_script_function_t func,
+				      int argc, char **args);
 
 char **
 grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count);
 
+static inline struct grub_script *
+grub_script_get (struct grub_script *script)
+{
+  if (script)
+    script->refcnt++;
+  return script;
+}
+
+static inline void
+grub_script_put (struct grub_script *script)
+{
+  if (! script)
+    return;
+
+  if (script->refcnt == 0)
+    grub_script_free (script);
+  else
+    script->refcnt--;
+}
+
 grub_err_t
 grub_normal_parse_line (char *line, grub_reader_getline_t getline);