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

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

	* script/sh/lexer.c (check_textstate): accept GRUB_PARSER_STATE_ESC

diff --git a/ChangeLog b/ChangeLog
index 557a33a1985f60c0b8b6740582c782024f79dad6..df404336ef2031c9c78fadfe5eaeb7de33d01412 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Fix handling of string like \"hello\" and "a
+       b"
+
+       * script/sh/lexer.c (check_textstate): accept GRUB_PARSER_STATE_ESC
+       (grub_script_yylex): fix parsing of quoting, escaping and newline
+
 2009-06-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * loader/i386/multiboot.c (grub_multiboot_get_bootdev): fix partition 

diff --git a/script/sh/lexer.c b/script/sh/lexer.c
index aa8ac35aa13f774921d40ceb453934d9b36e3c8b..f21430fe1db92662003070f01207fa45156d868a 100644 (file)
--- a/script/sh/lexer.c
+++ b/script/sh/lexer.c
@@ -39,6 +39,7 @@ static int
 check_textstate (grub_parser_state_t state)
 {
   return (state == GRUB_PARSER_STATE_TEXT
+         || state == GRUB_PARSER_STATE_ESC
          || state == GRUB_PARSER_STATE_QUOTE
          || state == GRUB_PARSER_STATE_DQUOTE);
 }