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.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 744e08d9 for ; Mon, 24 Jun 2019 19:02:59 +0000 (UTC) Received: (qmail 12111 invoked by alias); 24 Jun 2019 19:02:51 -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: 44446 Received: (qmail 8223 invoked by uid 1010); 24 Jun 2019 19:02:51 -0000 X-Qmail-Scanner-Diagnostics: from know-smtprelay-omc-5.server.virginmedia.net by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.101.2/25489. spamassassin: 3.4.2. Clear:RC:0(80.0.253.69):SA:0(-2.0/5.0):. Processed in 3.557226 secs); 24 Jun 2019 19:02:51 -0000 X-Envelope-From: p.w.stephenson@ntlworld.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _smtprelay.virginmedia.com designates 80.0.253.69 as permitted sender) X-Originating-IP: [86.16.88.158] X-Authenticated-User: p.w.stephenson@ntlworld.com X-Spam: 0 X-Authority: v=2.3 cv=Y/zWTCWN c=1 sm=1 tr=0 a=MiHCjVqLJ44lE3bxSlffFQ==:117 a=MiHCjVqLJ44lE3bxSlffFQ==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=IkcTkHD0fZMA:10 a=uEMl8qaPuCitJ6qAGMIA:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ntlworld.com; s=meg.feb2017; t=1561402929; bh=xjUoKEU3QgkXZT4X6JbvNwwnxXt/3WZz896WVfcKtZE=; h=Subject:From:To:Date:In-Reply-To:References; b=bsw5EbqKaiL/snO7MaFEL9cnndsEkb6nqIWbIE+dBO0/ezz/dGFPYq1DNXZ/X/1tv f56omhK38/ncAlkt4H4EdrYX/5XX6tdlko0CLKLqwOpy5tf/ArbMJmjA/r9EMic7dd hucL+ogT9pCKYfunRT3aKcG+YFevb0h3ryuYY4zXCa8EpztIB0zojACyfaxKHQEe9g SgJxVY8UtOQMyib+785YiiV6gnqpmOQB7mFpAfufll7NokNBQLR6g3LU7aZSXY0Mk0 wSHULnVp7a8oB8d15dZ3VOV03lzdBhLPPddkP9OEgQIen6k8eDYRCkv/SQiGpxZYfj 6Wygz8Yn5k8RQ== Message-ID: <16fed15234db4cd724a977063f425d105600250c.camel@ntlworld.com> Subject: Re: [bug] {fd}< To: zsh-workers@zsh.org Date: Mon, 24 Jun 2019 20:02:09 +0100 In-Reply-To: <20190620050214.iex364omy7kfxqng@chaz.gmail.com> References: <20190620050214.iex364omy7kfxqng@chaz.gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfPLfEE6OrcUyTKRdPkSnQlaZliG7aL9IWZZoirSLaGLcsewEARzqGSVd1ajbCmh4L6Pwr4YfNeLUhFNtOx6I3wBnGw285q/jqJL07XACavi1nRmGTQ2m ilzmwYNeW2g/BvsNkR6EYm0SmbD52Yu1cXY2+JUMcPgtHjCIBCzgnAlj On Thu, 2019-06-20 at 06:02 +0100, Stephane Chazelas wrote: > $ zsh -xc $': {fd}<< EOF\nEOF' > +zsh:1> [[ - $'\C-D'zsh:1: bad cond code > ]] > > On the more complicated code I first ran into the problem, it > was crashing with "out of memory". > > exec {fd}< EOF > > is a bash-compatible way to get a temp file that automatically > cleans up on exit. Needs Linux or Cygwin to manipulate it with > /dev/fd/$fd diff --git a/Src/parse.c b/Src/parse.c index 27234497b..53709ac00 100644 --- a/Src/parse.c +++ b/Src/parse.c @@ -2279,7 +2279,8 @@ par_redir(int *rp, char *idstring) void setheredoc(int pc, int type, char *str, char *termstr, char *munged_termstr) { - ecbuf[pc] = WCB_REDIR(type | REDIR_FROM_HEREDOC_MASK); + int varid = WC_REDIR_VARID(ecbuf[pc]) ? REDIR_VARID_MASK : 0; + ecbuf[pc] = WCB_REDIR(type | REDIR_FROM_HEREDOC_MASK | varid); ecbuf[pc + 2] = ecstrcode(str); ecbuf[pc + 3] = ecstrcode(termstr); ecbuf[pc + 4] = ecstrcode(munged_termstr); diff --git a/Test/A04redirect.ztst b/Test/A04redirect.ztst index 1e17dddd4..d60519064 100644 --- a/Test/A04redirect.ztst +++ b/Test/A04redirect.ztst @@ -692,11 +692,19 @@ >b >d - umask 0777 + (umask 0777 cat <<' HERE' look ma, no permissions HERE cat <<<"it's a miracle" + ) 0:Here-{string,document}s succeed with restrictive umask > look ma, no permissions >it's a miracle + + exec {testfd}<<' HERE' + This is, in some sense, a here document. + HERE + cat <&$testfd +0:Regression test for here document with fd declarator +> This is, in some sense, a here document.