some bug fixes

diff --git a/script/lexer.c b/script/lexer.c
index 17c38a353bf9998b14a48233ab8b6485e27f544e..caefdb7a778a83665789b1be043b88865c9197fd 100644 (file)
--- a/script/lexer.c
+++ b/script/lexer.c
@@ -139,7 +139,7 @@ append_newline (const char *src)
   grub_size_t len;
 
   len = grub_strlen (src);
-  line = grub_malloc (len + 1);
+  line = grub_malloc (len + 2);
   if (!line)
     return 0;
 

diff --git a/script/yylex.l b/script/yylex.l
index 9cafba5c29f31b3e848438ad898cca2f0ddb2c23..7cef8496bca9d9e69be0b3511663c49450c8f52b 100644 (file)
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -128,13 +128,13 @@ typedef grub_size_t yy_size_t;
 BLANK           [ \t]
 COMMENT         ^[ \t]*#.*$
 
-CHAR            [^|&;()<> \t\n\'\"]
+CHAR            [^|&$;()<> \t\n\'\"\\]
 DIGITS          [[:digit:]]+
 NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 
 ESC             \\.
 VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}
-DQSTR           \"([^\"]|\\\")*\"
+DQSTR           \"([^\\\"]|{ESC})*\"
 SQSTR           \'[^\']*\'
 WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 
@@ -190,6 +190,7 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 {WORD}          {
                   RECORD;
                   /* resplit yytext */
+                 grub_dprintf ("lexer", "word: [%s]\n", yytext);
                   yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
                   if (yy_scan_string (yytext, yyscanner))
                     {
@@ -209,7 +210,6 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
                   return GRUB_PARSER_TOKEN_BAD;
                 }
 
-
  /* Split word into multiple args */
 
 <SPLIT>{