grub2: fix empty file handling

[petitboot] / discover / grub2 / parser.y

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 6d3ff2117140dd9d4b3b8a1de7643fa1cd3429ac..9d79d9b9b136aeeed1abf010ffe81db568f24586 100644 (file)
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -2,21 +2,16 @@
 %pure-parser
 %lex-param { yyscan_t scanner }
 %parse-param { struct grub2_parser *parser }
+%parse-param { void *scanner }
 %error-verbose
 
 %{
 #include <talloc/talloc.h>
+#include <log/log.h>
 
 #include "grub2.h"
-#include "parser.h"
-#include "lexer.h"
-
-static void print_token(FILE *fp, int type, YYSTYPE value);
-
-#define YYLEX_PARAM parser->scanner
-#define YYPRINT(f, t, v) print_token(f, t, v)
 
-static void yyerror(struct grub2_parser *, char const *s);
+void yyerror(struct grub2_parser *parser, const char *fmt, ...);
 %}
 
 %union {
@@ -65,6 +60,10 @@ static void yyerror(struct grub2_parser *, char const *s);
 %start script
 %debug
 
+%{
+#include "lexer.h"
+%}
+
 %%
 
 script:        statements {
@@ -84,7 +83,9 @@ statements: /* empty */ {
                $$ = $1;
        }
 
-conditional: statement TOKEN_EOL "then" TOKEN_EOL statements {
+sep:   TOKEN_DELIM | TOKEN_EOL;
+
+conditional: statement TOKEN_EOL "then" sep statements {
                $$ = create_statement_conditional(parser, $1, $5);
        }
 
@@ -112,7 +113,7 @@ statement:
        }
        | "if" TOKEN_DELIM conditional
                elifs
-               "else" TOKEN_EOL
+               "else" sep
                statements
                "fi" {
                $$ = create_statement_if(parser, $3, $4, $7);
@@ -129,6 +130,12 @@ statement:
                /* we just flatten everything */
                $$ = create_statement_block(parser, $6);
        }
+       | "for" TOKEN_DELIM word TOKEN_DELIM "in" TOKEN_DELIM words TOKEN_EOL
+               "do" sep
+               statements
+               "done" {
+               $$ = create_statement_for(parser, $3, $7, $11);
+       }
 
 words: word {
                $$ = create_argv(parser);
@@ -146,18 +153,17 @@ word:     TOKEN_WORD
        }
 
 %%
-void yyerror(struct grub2_parser *parser, char const *s)
+void yyerror(struct grub2_parser *parser, const char *fmt, ...)
 {
-       fprintf(stderr, "%d: error: %s '%s'\n",
-                       yyget_lineno(parser->scanner),
-                       s, yyget_text(parser->scanner));
-}
+       const char *str;
+       va_list ap;
 
-static void print_token(FILE *fp, int type, YYSTYPE value)
-{
-       if (type != TOKEN_WORD)
-               return;
-       fprintf(fp, "%s", value.word->text);
+       va_start(ap, fmt);
+       str = talloc_vasprintf(parser, fmt, ap);
+       va_end(ap);
+
+       pb_log("parse error: %d('%s'): %s\n", yyget_lineno(parser->scanner),
+                                       yyget_text(parser->scanner), str);
 }
 
 struct grub2_statements *create_statements(struct grub2_parser *parser)
@@ -243,6 +249,19 @@ struct grub2_statement *create_statement_function(struct grub2_parser *parser,
        return &stmt->st;
 }
 
+struct grub2_statement *create_statement_for(struct grub2_parser *parser,
+               struct grub2_word *var, struct grub2_argv *list,
+               struct grub2_statements *body)
+{
+       struct grub2_statement_for *stmt =
+               talloc(parser, struct grub2_statement_for);
+       stmt->st.exec = statement_for_execute;
+       stmt->var = var;
+       stmt->list = list;
+       stmt->body = body;
+       return &stmt->st;
+}
+
 void statement_append(struct grub2_statements *stmts,
                struct grub2_statement *stmt)
 {
@@ -304,14 +323,21 @@ struct grub2_parser *grub2_parser_create(struct discover_context *ctx)
        return parser;
 }
 
-void grub2_parser_parse(struct grub2_parser *parser, char *buf, int len)
+void grub2_parser_parse(struct grub2_parser *parser, const char *filename,
+               char *buf, int len)
 {
        YY_BUFFER_STATE bufstate;
        int rc;
 
+       if (!len)
+               return;
+
+       parser->script->filename = filename;
+
        bufstate = yy_scan_bytes(buf, len - 1, parser->scanner);
+       yyset_lineno(1, parser->scanner);
 
-       rc = yyparse(parser);
+       rc = yyparse(parser, parser->scanner);
 
        yy_delete_buffer(bufstate, parser->scanner);