summaryrefslogtreecommitdiffstats
path: root/discover
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-09-17 14:36:43 +0800
committerJeremy Kerr <jk@ozlabs.org>2013-09-24 13:14:59 +0800
commitbda4feeab43ec0ef8bf2bf63d54d81ab54f3ba51 (patch)
tree882fb5117560de9e424bb10f5586c647f268ad4d /discover
parentd39ae394911f945cd4a7789a8b210a5662852c46 (diff)
downloadtalos-petitboot-bda4feeab43ec0ef8bf2bf63d54d81ab54f3ba51.tar.gz
talos-petitboot-bda4feeab43ec0ef8bf2bf63d54d81ab54f3ba51.zip
discover/grub2: fix comment handling
Remove '#' from the list of word chars. Also, don't need the '$' char in the comment regex Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover')
-rw-r--r--discover/grub2/lexer.l5
1 files changed, 2 insertions, 3 deletions
diff --git a/discover/grub2/lexer.l b/discover/grub2/lexer.l
index 6ed12ce..aca474a 100644
--- a/discover/grub2/lexer.l
+++ b/discover/grub2/lexer.l
@@ -21,7 +21,7 @@
%x sqstring
%x dqstring
-WORD [^{}|&$;<> \t\n'"]+
+WORD [^{}|&$;<> \t\n'"#]+
VARNAME ([[:alpha:]][_[:alnum:]]*|[0-9]|[\?@\*#])
%%
@@ -116,8 +116,7 @@ VARNAME ([[:alpha:]][_[:alnum:]]*|[0-9]|[\?@\*#])
[ \t]*(;|\n)[ \t]* return TOKEN_EOL;
/* strip comments */
-#.*$ ;
-
+#.* ;
. printf("unknown token '%s'\n", yytext); exit(1);
OpenPOWER on IntegriCloud