Remove nested functions from script reading and parsing.

* grub-core/kern/parser.c (grub_parser_split_cmdline): Add
getline_data argument, passed to getline.
* grub-core/kern/rescue_parser.c (grub_rescue_parse_line): Add
getline_data argument, passed to grub_parser_split_cmdline.
* grub-core/script/lexer.c (grub_script_lexer_yywrap): Pass
lexerstate->getline_data to lexerstate->getline.
(grub_script_lexer_init): Add getline_data argument, saved in
lexerstate->getline_data.
* grub-core/script/main.c (grub_normal_parse_line): Add getline_data
argument, passed to grub_script_parse.
* grub-core/script/script.c (grub_script_parse): Add getline_data
argument, passed to grub_script_lexer_init.
* include/grub/parser.h (grub_parser_split_cmdline): Update
prototype.  Update all callers to pass appropriate getline data.
(struct grub_parser.parse_line): Likewise.
(grub_rescue_parse_line): Likewise.
* include/grub/reader.h (grub_reader_getline_t): Add void *
argument.
* include/grub/script_sh.h (struct grub_lexer_param): Add
getline_data member.
(grub_script_parse): Update prototype.  Update all callers to pass
appropriate getline data.
(grub_script_lexer_init): Likewise.
(grub_normal_parse_line): Likewise.

* grub-core/commands/legacycfg.c (legacy_file_getline): Add unused
data argument.
* grub-core/kern/parser.c (grub_parser_execute: getline): Make
static instead of nested.  Rename to ...
(grub_parser_execute_getline): ... this.
* grub-core/kern/rescue_reader.c (grub_rescue_read_line): Add unused
data argument.
* grub-core/normal/main.c (read_config_file: getline): Make static
instead of nested.  Rename to ...
(read_config_file_getline): ... this.
(grub_normal_read_line): Add unused data argument.
* grub-core/script/execute.c (grub_script_execute_sourcecode:
getline): Make static instead of nested.  Rename to ...
(grub_script_execute_sourcecode_getline): ... this.
* util/grub-script-check.c (main: get_config_line): Make static
instead of nested.

grub-core/kern/parser.c

@@ -107,7 +107,8 @@ check_varstate (grub_parser_state_t s)
 }
 
 grub_err_t
-grub_parser_split_cmdline (const char *cmdline, grub_reader_getline_t getline,
+grub_parser_split_cmdline (const char *cmdline,
+			   grub_reader_getline_t getline, void *getline_data,
 			   int *argc, char ***argv)
 {
   grub_parser_state_t state = GRUB_PARSER_STATE_TEXT;
@@ -149,7 +150,7 @@ grub_parser_split_cmdline (const char *cmdline, grub_reader_getline_t getline,
       if (!rd || !*rd)
 	{
 	  if (getline)
-	    getline (&rd, 1);
+	    getline (&rd, 1, getline_data);
 	  else
 	    break;
 	}
@@ -232,36 +233,39 @@ grub_parser_split_cmdline (const char *cmdline, grub_reader_getline_t getline,
   return 0;
 }
 
+/* Helper for grub_parser_execute.  */
+static grub_err_t
+grub_parser_execute_getline (char **line, int cont __attribute__ ((unused)),
+			     void *data)
+{
+  char **source = data;
+  char *p;
+
+  if (!*source)
+    {
+      *line = 0;
+      return 0;
+    }
+
+  p = grub_strchr (*source, '\n');
+
+  if (p)
+    *line = grub_strndup (*source, p - *source);
+  else
+    *line = grub_strdup (*source);
+  *source = p ? p + 1 : 0;
+  return 0;
+}
+
 grub_err_t
 grub_parser_execute (char *source)
 {
-  auto grub_err_t getline (char **line, int cont);
-  grub_err_t getline (char **line, int cont __attribute__ ((unused)))
-  {
-    char *p;
-
-    if (!source)
-      {
-	*line = 0;
-	return 0;
-      }
-
-    p = grub_strchr (source, '\n');
-
-    if (p)
-      *line = grub_strndup (source, p - source);
-    else
-      *line = grub_strdup (source);
-    source = p ? p + 1 : 0;
-    return 0;
-  }
-
   while (source)
     {
       char *line;
 
-      getline (&line, 0);
-      grub_rescue_parse_line (line, getline);
+      grub_parser_execute_getline (&line, 0, &source);
+      grub_rescue_parse_line (line, grub_parser_execute_getline, &source);
       grub_free (line);
     }
 

grub-core/kern/rescue_parser.c

@@ -26,14 +26,16 @@
 #include <grub/i18n.h>
 
 grub_err_t
-grub_rescue_parse_line (char *line, grub_reader_getline_t getline)
+grub_rescue_parse_line (char *line,
+			grub_reader_getline_t getline, void *getline_data)
 {
   char *name;
   int n;
   grub_command_t cmd;
   char **args;
 
-  if (grub_parser_split_cmdline (line, getline, &n, &args) || n < 0)
+  if (grub_parser_split_cmdline (line, getline, getline_data, &n, &args)
+      || n < 0)
     return grub_errno;
 
   if (n == 0)

grub-core/kern/rescue_reader.c

@@ -30,7 +30,8 @@ static char linebuf[GRUB_RESCUE_BUF_SIZE];
 
 /* Prompt to input a command and read the line.  */
 static grub_err_t
-grub_rescue_read_line (char **line, int cont)
+grub_rescue_read_line (char **line, int cont,
+		       void *data __attribute__ ((unused)))
 {
   int c;
   int pos = 0;
@@ -87,11 +88,11 @@ grub_rescue_run (void)
       grub_print_error ();
       grub_errno = GRUB_ERR_NONE;
 
-      grub_rescue_read_line (&line, 0);
+      grub_rescue_read_line (&line, 0, NULL);
       if (! line || line[0] == '\0')
 	continue;
 
-      grub_rescue_parse_line (line, grub_rescue_read_line);
+      grub_rescue_parse_line (line, grub_rescue_read_line, NULL);
       grub_free (line);
     }
 }