dash tested against ash testsuite: 17 failures

Commit Message

Harald van Dijk March 7, 2018, 6:19 p.m. UTC

On 3/7/18 7:51 AM, Herbert Xu wrote:
> On Wed, Mar 07, 2018 at 07:49:16AM +0100, Harald van Dijk wrote:
>>
>> This was wrong in the original patch, but I'm not seeing it in the updated
>> patch that you replied to. When parsing a heredoc where part of delimiter is
>> quoted, syntax==SQSYNTAX. Since the calls to pgetc_eatbnl() are conditional
>> on syntax!=SQSYNTAX, there shouldn't be a problem. It would be a different
>> story if the delimiter could be an unquoted backslash, but thankfully that
>> is not possible.
> 
> Good point.  In that case please resend it with the pgetc2 change
> and it should be good to go.

Here you go.

The problem with

   dash -c 'alias x=
   x'

and

   dash -c 'alias bs=\\
   bs
   '

looks like it just needs one extra line, so also attached as a separate 
patch.

Cheers,
Harald van Dijk

Comments

Herbert Xu March 8, 2018, 6:30 a.m. UTC | #1

On Wed, Mar 07, 2018 at 07:19:56PM +0100, Harald van Dijk wrote:
> On 3/7/18 7:51 AM, Herbert Xu wrote:
> >On Wed, Mar 07, 2018 at 07:49:16AM +0100, Harald van Dijk wrote:
> >>
> >>This was wrong in the original patch, but I'm not seeing it in the updated
> >>patch that you replied to. When parsing a heredoc where part of delimiter is
> >>quoted, syntax==SQSYNTAX. Since the calls to pgetc_eatbnl() are conditional
> >>on syntax!=SQSYNTAX, there shouldn't be a problem. It would be a different
> >>story if the delimiter could be an unquoted backslash, but thankfully that
> >>is not possible.
> >
> >Good point.  In that case please resend it with the pgetc2 change
> >and it should be good to go.
> 
> Here you go.
> 
> The problem with
> 
>   dash -c 'alias x=
>   x'
> 
> and
> 
>   dash -c 'alias bs=\\
>   bs
>   '
> 
> looks like it just needs one extra line, so also attached as a separate
> patch.

Could you please resend these patches as two separate emails please?
Patchwork cannot handle two patches in one email:

	https://patchwork.kernel.org/patch/10264661/

Also it would be nice if you could include the patch descriptions
in each email as these will go into the git tree.

Thanks,

Patch

diff --git a/src/parser.c b/src/parser.c
index 382658e..7dac168 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -154,6 +154,7 @@  list(int nlflag)
 
 	n1 = NULL;
 	for (;;) {
+		checkkwd = CHKKWD | CHKALIAS;
 		switch (peektoken()) {
 		case TNL:
 			if (!(nlflag & 1))