2009-06-15 Vladimir Serbinenko <phcoder@gmail.com>

	Fix handling of string like \"hello\" and "a
	b"

	* script/sh/lexer.c
	(grub_script_yylex): fix parsing of quoting, escaping and newline

diff --git a/script/sh/lexer.c b/script/sh/lexer.c
index 47939c96d2e6a2d00b1c1b7bd5f408418684382a..99bd3baac88a72f356f7b3fa398ecaa2fcabaddb 100644 (file)
--- a/script/sh/lexer.c
+++ b/script/sh/lexer.c
@@ -280,7 +280,9 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
                 when a special token was found.  It will be recognized
                 next time when this function is called.  */
              if (newstate == GRUB_PARSER_STATE_TEXT
-                 && state->state != GRUB_PARSER_STATE_ESC)
+                 && state->state != GRUB_PARSER_STATE_ESC
+                 && state->state != GRUB_PARSER_STATE_QUOTE
+                 && state->state != GRUB_PARSER_STATE_DQUOTE)
                {
                  int breakout = 0;