[2323] 2009-06-15 Vladimir Serbinenko <[email protected]>

Revision: 2323
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2323
Author:   phcoder
Date:     2009-06-15 20:59:55 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
2009-06-15  Vladimir Serbinenko  <[email protected]>

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

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

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/script/sh/lexer.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-06-13 21:09:11 UTC (rev 2322)
+++ trunk/grub2/ChangeLog	2009-06-15 20:59:55 UTC (rev 2323)
@@ -1,3 +1,11 @@
+2009-06-15  Vladimir Serbinenko  <[email protected]>
+
+	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  <[email protected]>
 
 	* loader/i386/multiboot.c (grub_multiboot_get_bootdev): fix partition 

Modified: trunk/grub2/script/sh/lexer.c
===================================================================
--- trunk/grub2/script/sh/lexer.c	2009-06-13 21:09:11 UTC (rev 2322)
+++ trunk/grub2/script/sh/lexer.c	2009-06-15 20:59:55 UTC (rev 2323)
@@ -39,6 +39,7 @@
 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);
 }