From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 6c8f70ed for ; Fri, 21 Dec 2018 08:11:40 +0000 (UTC) Received: (qmail 8992 invoked by alias); 21 Dec 2018 08:11:27 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 43921 Received: (qmail 28655 invoked by uid 1010); 21 Dec 2018 08:11:27 -0000 X-Qmail-Scanner-Diagnostics: from mail-lf1-f44.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.100.2/25112. spamassassin: 3.4.2. Clear:RC:0(209.85.167.44):SA:0(-1.9/5.0):. Processed in 0.794991 secs); 21 Dec 2018 08:11:27 -0000 X-Envelope-From: schaefer@brasslantern.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=lURpj0XYqpJeqPNp1ApwZ/55o3bwGsRXiDlF4/MjV+g=; b=vVa6julUJjA45XxB3jODKEsnFElIGG3eb7k9EmkG/7HLyWy1gkPmXrDtHrdBw/A4Bl nP0OixUhi8QFEuS7v8XsQzn2uUA2jaoxnQAke6EU86qXuYp3btWYRVz6HxvbUPrddHvm 06F9KAeEaiIHnT1WBdaX5tzhDjstmXCzd01gn+uZOfk4AiQwAG4vYMchQlnBd7goRZBo dng/hLwqGp+/DkzDGOFfDAMCUPemhlViMG4x5JGuMNz/EMJGRbmkPoY/U4Yv4x5ih/DS Ej16ozZjGWEpVCYvfuhqHGWF9k/2oKyl+0wCcCnimWFZ33T6umW+Gjgef8F1zYQfY7PF loZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=lURpj0XYqpJeqPNp1ApwZ/55o3bwGsRXiDlF4/MjV+g=; b=M0fbuMUxAf/yFEmiiFjJhvC29m9bR9IiX9svG2QJvNqEo7CP4HiFiElKDIKH6A3+OY iq8bZmA8VxNsAst9kOZyQDGOG35eu36DmWFepOHEuDt5U8xbOyMYrbV7VdpxahSFNdYL 0IAMlW0/QsOtMtQI1tIWj+tIwmQdBmL+omUmTH5nzbCfxpJQAKOtjnGQRUMGduHdWECq JFDYUrYmJk3LRWoIwtzEHM+3g7lmV6VVUQlXVI1L2zHpthk+0vAHLQEudYgC9EM9duP2 VEY5AHNrfWVZ9ZXDKShkbbN4vDSceOZNMi2LlpQ6iUEhDF2n7dwW5IptPHpJqd9I/qIy VOjA== X-Gm-Message-State: AA+aEWa9JrWkwDry2G5/et4grl4Pn4f1iALUd9krAnJIZeMle303CrRu d+q8/geLsttcKIxAGXcRYis7i8FUMHZVQiePNkGaWNmkOV0= X-Google-Smtp-Source: AFSGD/VTGFCjcArD1b/vW4LnGQAkf0v6CTHs/BtwXQlx0G8F22dHhsk/l7ylZc4sKrKiBp6tZLqsLG9ZN4oP2vo9qlY= X-Received: by 2002:a19:2584:: with SMTP id l126mr762498lfl.69.1545379881373; Fri, 21 Dec 2018 00:11:21 -0800 (PST) MIME-Version: 1.0 References: <18f684a8-2fec-4ebe-a63e-cf6688ae519f@inlv.org> In-Reply-To: From: Bart Schaefer Date: Fri, 21 Dec 2018 00:11:09 -0800 Message-ID: Subject: Fix for ${\var} oddity To: "zsh-workers@zsh.org" Content-Type: text/plain; charset="UTF-8" On Thu, Dec 20, 2018 at 11:53 PM Bart Schaefer wrote: > > > > The \ is not removed before var expansion, ${\#} is not ${#} > > > and \# is not a valid var name, nor is \ if this is being parsed > > > as a substring match on ${\} > > > so this should be a syntax error > > > (at least in sh emulation mode). > > This one surprised me. Seems to come down to this code in params.c: > > 2341 } else if (inbrace && inull(*s)) { > 2342 /* > 2343 * Handles things like ${(f)"$( 2344 * the double quotes. We don't need to know what was > 2345 * actually there; the presence of a String or Qstring > 2346 * is good enough. > 2347 */ > 2348 s++; > > inull() is expected to match a quote there, but it happens to also > match backslash. Fix in another thread. diff --git a/Src/subst.c b/Src/subst.c index ff6750a..60eb333 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -2338,7 +2338,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int zerr("bad substitution"); return NULL; } - } else if (inbrace && inull(*s)) { + } else if (inbrace && inull(*s) && *s != Bnull) { /* * Handles things like ${(f)"$(