discover/grub2: Populate $prefix from config file location

[petitboot] / discover / grub2 / parser.y

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 02ca7b2799f53f57bc9ef55f6dcfacbdae880a67..5a4d4f8e204a97181396ee8ea9800a56113b313f 100644 (file)
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -6,17 +6,15 @@
 
 %{
 #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 {
@@ -148,18 +146,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)
@@ -306,12 +303,16 @@ 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;
 
+       parser->script->filename = filename;
+
        bufstate = yy_scan_bytes(buf, len - 1, parser->scanner);
+       yyset_lineno(1, parser->scanner);
 
        rc = yyparse(parser);