From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13400 invoked by alias); 11 Mar 2017 20:05:06 -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: X-Seq: 40832 Received: (qmail 1602 invoked from network); 11 Mar 2017 20:05:05 -0000 X-Qmail-Scanner-Diagnostics: from mail-ua0-f182.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.217.182):SA:0(-0.0/5.0):. Processed in 1.353636 secs); 11 Mar 2017 20:05:05 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: schaefer@brasslantern.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.217.182 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20150623.gappssmtp.com; s=20150623; h=from:message-id:date:in-reply-to:comments:references:to:subject :mime-version; bh=2JDMM/ZGMJCHv8LxuyKOq0Lq0OKw31MM6nY2+MAoFys=; b=wDbvO9zY5WFt8MKEoNcYB7a+4OZb+Y0puos/6mVUQp+RT9yzWpI4CiymwoHLoomaHp RwdeG5SnFLX1PgOxC/IdRdl9FW7YDyMsUA+Yevdt/GaNg6sQOzMikdNEEpE5AsGjODuy cIhfOMXUloVaqRgVLd5yhoX/o20TwmiYFS/HIJm0G/vvz4/dGkReDMKbnITYT631JJsy TCh9RszNpdfp4ffNRkRw4CTUZRirnBrVEZpMCHuZL8u1oVyzVcMyT2g09gNaymnXCGVr FMNTtNslN6jKC5MMQzwLyJii50H0qqCxXAC3gHGFH0zD82fl8nfZH708xWCsND1njtPK 0H1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:date:in-reply-to:comments :references:to:subject:mime-version; bh=2JDMM/ZGMJCHv8LxuyKOq0Lq0OKw31MM6nY2+MAoFys=; b=hRO69lqNC/l0FAEu3JXc2Cx5lNAdpw7ssOu3V3SRIA/KqBspbg13yJOBlcOVx7VO9D Lavc8n7U3F+6fv27/IC8MdCWI+HdVAN7751chfzPCvZgvrKNxxFmTuS/ykql4qRoHFzw aytVK1DvxORHSzG6nPBaGZQtAOSMv2lleEOnrn/dVoVEtXxt7qp8Ikiz35dyjjAAwkpw PeYS5ixhrgZtvAgmS+Auseck9kr26O0RNnT93hcGccSsWpYkEFG41pXQtx5auMBZOQA/ 8GN3bqoLXn63WuyxI5OEypX+oPxZB7PLmInNVt2Rhy20yE6e/abep5pFo8bgFMp10Tiz Y33g== X-Gm-Message-State: AMke39kSOY2dT9lAUSV5ccq68PdkIT+NKmNR9xDg1aAN3/oyIMcFrkd0N7IHs68tXRQOmQ== X-Received: by 10.176.67.196 with SMTP id l62mr12570955ual.89.1489262697520; Sat, 11 Mar 2017 12:04:57 -0800 (PST) From: Bart Schaefer Message-Id: <170311120532.ZM3348@torch.brasslantern.com> Date: Sat, 11 Mar 2017 12:05:32 -0800 In-Reply-To: <20170311084745.GA5364@fujitsu.shahaf.local2> Comments: In reply to Daniel Shahaf "Re: Bug with :P modifier when current directory is the root" (Mar 11, 8:47am) References: <170310182501.ZM17524@torch.brasslantern.com> <20170311084745.GA5364@fujitsu.shahaf.local2> X-Mailer: OpenZMail Classic (0.9.2 24April2005) To: zsh-workers@zsh.org Subject: Re: Bug with :P modifier when current directory is the root MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii On Mar 11, 8:47am, Daniel Shahaf wrote: } } zgetcwd() can return "." if the current working directory has been } deleted by another process. One of those cases it's annoying to have to waste time on, since it is so rare and the result will be broken anyway, but I suppose I should commit it like the below. diff --git a/Src/subst.c b/Src/subst.c index 2214b3d..e639c96 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -4336,7 +4336,11 @@ modify(char **str, char **ptr) break; case 'P': if (*copy != '/') { - copy = zhtricat(metafy(zgetcwd(), -1, META_HEAPDUP), "/", copy); + char *here = zgetcwd(); + if (here[strlen(here)-1] != '/') + copy = zhtricat(metafy(here, -1, META_HEAPDUP), "/", copy); + else + copy = dyncat(here, copy); } copy = xsymlink(copy, 1); break; @@ -4418,7 +4422,11 @@ modify(char **str, char **ptr) break; case 'P': if (**str != '/') { - *str = zhtricat(metafy(zgetcwd(), -1, META_HEAPDUP), "/", *str); + char *here = zgetcwd(); + if (here[strlen(here)-1] != '/') + *str = zhtricat(metafy(here, -1, META_HEAPDUP), "/", *str); + else + *str = dyncat(here, *str); } *str = xsymlink(*str, 1); break;