From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MyreP-0000AO-Nk for mharc-grub-devel@gnu.org; Fri, 16 Oct 2009 14:35:41 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MyreO-00008d-9W for grub-devel@gnu.org; Fri, 16 Oct 2009 14:35:40 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MyreJ-0008SY-IM for grub-devel@gnu.org; Fri, 16 Oct 2009 14:35:39 -0400 Received: from [199.232.76.173] (port=60534 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MyreJ-0008SI-Cf; Fri, 16 Oct 2009 14:35:35 -0400 Received: from xvm-190-8.ghst.net ([217.70.190.8]:45500 helo=aybabtu.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MyreI-0005pB-W0; Fri, 16 Oct 2009 14:35:35 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1MyreG-0002UB-1O; Fri, 16 Oct 2009 20:35:32 +0200 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1MyreF-0001qC-D8; Fri, 16 Oct 2009 20:35:31 +0200 Date: Fri, 16 Oct 2009 20:35:31 +0200 From: Robert Millan To: The development of GRUB 2 Message-ID: <20091016183531.GD7037@thorin> References: <20091013-211116.sv74720.58002@savannah.gnu.org> <4AD72362.3030805@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4AD72362.3030805@gmail.com> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: bug-grub@gnu.org, Andreas Born Subject: Re: [bug #27695] parser.sh ignores the closing quote when preceeded by a variable X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Oct 2009 18:35:40 -0000 On Thu, Oct 15, 2009 at 03:28:02PM +0200, Vladimir 'phcoder' Serbinenko wrote: > diff --git a/script/sh/lexer.c b/script/sh/lexer.c > index a30e3c0..0c71dae 100644 > --- a/script/sh/lexer.c > +++ b/script/sh/lexer.c > @@ -350,9 +350,11 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate) > if (! (check_varstate (newstate))) > { > if (state->state == GRUB_PARSER_STATE_VARNAME2 > - || state->state == GRUB_PARSER_STATE_QVARNAME2) > - nextchar (state); > - state->state = newstate; > + || state->state == GRUB_PARSER_STATE_QVARNAME2) > + { > + nextchar (state); > + state->state = newstate; > + } > break; > } > > @@ -378,7 +380,6 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate) > > buffer[bufpos++] = 0; > > - state->state = newstate; > yylval->arg = grub_script_arg_add (parsestate, yylval->arg, > GRUB_SCRIPT_ARG_TYPE_VAR, buffer); > grub_dprintf ("scripting", "vartoken=`%s'\n", buffer); Same here, I'm afraid. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."