From: phcoder <phcoder@localhost>
Date: Mon, 15 Jun 2009 21:05:50 +0000 (+0000)
Subject: 2009-06-15  Vladimir Serbinenko  <phcoder@gmail.com>
X-Git-Tag: 1.98~798
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3880eaf5e07f5a32273f3f346fbc530e7b0aba4;p=thirdparty%2Fgrub.git

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
---

diff --git a/script/sh/lexer.c b/script/sh/lexer.c
index d3577d44c..47939c96d 100644
--- a/script/sh/lexer.c
+++ b/script/sh/lexer.c
@@ -185,11 +185,18 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
 		break;
 	      grub_dprintf ("scripting", "token=`\\n'\n");
 	      recordchar (state, '\n');
-	      if (state->state != GRUB_PARSER_STATE_ESC)
+	      if (state->state != GRUB_PARSER_STATE_ESC
+		  && state->state != GRUB_PARSER_STATE_DQUOTE
+		  && state->state != GRUB_PARSER_STATE_QUOTE)
 		{
 		  state->tokenonhold = '\n';
 		  break;
 		}
+	      if (state->state == GRUB_PARSER_STATE_DQUOTE
+		  || state->state == GRUB_PARSER_STATE_QUOTE)
+		yylval->arg = grub_script_arg_add (parsestate, yylval->arg,
+						   GRUB_SCRIPT_ARG_TYPE_STR,
+						   "\n");
 	    }
 	  else
 	    {