From patchwork Wed Feb 14 21:44:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald van Dijk X-Patchwork-Id: 10220003 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3E8AD601C2 for ; Wed, 14 Feb 2018 21:43:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 299B028F07 for ; Wed, 14 Feb 2018 21:43:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CFC32904B; Wed, 14 Feb 2018 21:43:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, T_TVD_MIME_EPI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FC1228F07 for ; Wed, 14 Feb 2018 21:43:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031455AbeBNVn0 (ORCPT ); Wed, 14 Feb 2018 16:43:26 -0500 Received: from home.gigawatt.nl ([83.163.3.213]:34108 "EHLO home.gigawatt.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031444AbeBNVnZ (ORCPT ); Wed, 14 Feb 2018 16:43:25 -0500 Received: from [IPv6:2001:980:4809:1:e045:1301:c405:78bf] (unknown [IPv6:2001:980:4809:1:e045:1301:c405:78bf]) by home.gigawatt.nl (Postfix) with ESMTPSA id C60755402947; Wed, 14 Feb 2018 21:43:23 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 home.gigawatt.nl C60755402947 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gigawatt.nl; s=default; t=1518644604; bh=HuMXR6RDKmYQnt+tJC4+sFeSO1Ml+EKkGLFFi1QCvts=; l=1632; h=Subject:From:To:References:Date:In-Reply-To:From; b=WQxQ+w84+xG84tApQOhMBdSaokEQqC+sl96cfCPBXfqzj94GX2sjNIX9BHA5iXHJG vu6YpUFhSMItpVYxMmdGvpIVqQMsQUYr3KDoj2A1IlCoD6iVgchMSY0fIOOGWdVZcT 9orX0u0+6YUZn7/yB43HEYh8/xfBw2O7hGqKSJsg= Subject: Re: dash bug: double-quoted "\" breaks glob protection for next char From: Harald van Dijk To: Denys Vlasenko , Herbert Xu , dash@vger.kernel.org References: <5e1ee06d-d1ca-6442-51de-786e2739d4df@gigawatt.nl> Message-ID: <297b41c4-0e15-e0d8-f088-d68acfcc3c0f@gigawatt.nl> Date: Wed, 14 Feb 2018 22:44:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:58.0) Gecko/20100101 Thunderbird/58.0 MIME-Version: 1.0 In-Reply-To: <5e1ee06d-d1ca-6442-51de-786e2739d4df@gigawatt.nl> Content-Language: en-US Sender: dash-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dash@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 2/14/18 9:03 PM, Harald van Dijk wrote: > On 13/02/2018 14:53, Denys Vlasenko wrote: >> $ >'\zzzz' >> $ >'\wwww' >> $ dash -c 'echo "\*"' >> \wwww \zzzz > >[...] > > Currently: > > $ dash -c 'foo=a; echo "<${foo#[a\]]}>"' > <> > > This is what I expect, and also what bash, ksh and posh do. > > With your patch: > > $ dash -c 'foo=a; echo "<${foo#[a\]]}>"' > Does the attached look right as an alternative? It treats a quoted backslash the same way as if it were preceded by CTLESC in _rmescapes. It passes your test case and mine, but I'll do more extensive testing. Cheers, Harald van Dijk diff --git a/src/expand.c b/src/expand.c index 2a50830..af88a69 100644 --- a/src/expand.c +++ b/src/expand.c @@ -1686,12 +1686,17 @@ _rmescapes(char *str, int flag) } if (*p == (char)CTLESC) { p++; - if (notescaped) - *q++ = '\\'; - } else if (*p == '\\' && !inquotes) { - /* naked back slash */ - notescaped = 0; - goto copy; + goto escape; + } else if (*p == '\\') { + if (inquotes) { +escape: + if (notescaped) + *q++ = '\\'; + } else { + /* naked back slash */ + notescaped = 0; + goto copy; + } } notescaped = globbing; copy: