From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-36555-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 8086 invoked by alias); 19 Sep 2015 18:08:09 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 36555
Received: (qmail 29760 invoked from network); 19 Sep 2015 18:08:08 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham
	autolearn_force=no version=3.4.0
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20130820;
        h=x-gm-message-state:from:message-id:date:in-reply-to:comments
         :references:to:subject:mime-version:content-type;
        bh=ouluiSvWX/aivfuFgwP1z55mug0mlv3KAowBV5hufws=;
        b=agKDjgBp+T43z0NExAZscJKO2SD6jiTTKcrZ6d9CiTaXZD9Mrisj7X2GHo2qEBcp31
         rZbPIQHyZKSOw4yB8RDjlD/3+mVmehXad2O920DY4GfMIhrmPrLIoPS6vmi7Vm07ci/V
         kalmbNRi77wOlue3Of9g+mfA6PO8y4puW88yx5rIFkeTXvfyVC76auu7kqvqh1bXoqbO
         d2KiKwmUS237RzAh1LgIYnIJSO2b3s97v73ttYOmuO7E2gyN6+TT0DSSWqvMPTo8OPc6
         7h7WX3TCVnDqoUTwfrCs5pGFkIdQIJY01aZKhs3R+Z9hmrjSZGwkaCE1qKs6Ed23fFuh
         f8/A==
X-Gm-Message-State: ALoCoQmrUTkPVdw2FmK1Lnd3Y9BqrElrkMkdFS0xRol/taeZ8CJ6k7oZ36V4nwSC10RM0UrbvKJl
X-Received: by 10.182.158.164 with SMTP id wv4mr7494358obb.78.1442686083123;
        Sat, 19 Sep 2015 11:08:03 -0700 (PDT)
From: Bart Schaefer <schaefer@brasslantern.com>
Message-Id: <150919110800.ZM22888@torch.brasslantern.com>
Date: Sat, 19 Sep 2015 11:08:00 -0700
In-Reply-To: <20150916162630.GA6436@chaz.gmail.com>
Comments: In reply to Stephane Chazelas <stephane.chazelas@gmail.com>
        "bug with $PWD in /" (Sep 16,  5:26pm)
References: <20150916162630.GA6436@chaz.gmail.com>
X-Mailer: OpenZMail Classic (0.9.2 24April2005)
To: Zsh hackers list <zsh-workers@zsh.org>
Subject: Re: bug with $PWD in /
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

On Sep 16,  5:26pm, Stephane Chazelas wrote:
} 
} It looks like zsh has a similar issue as bash as reported at:
} http://thread.gmane.org/gmane.comp.shells.bash.bugs/24162

How about this?

diff --git a/Src/utils.c b/Src/utils.c
index 1de3d95..0016fa1 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -692,9 +692,19 @@ ispwd(char *s)
 {
     struct stat sbuf, tbuf;
 
-    if (stat(unmeta(s), &sbuf) == 0 && stat(".", &tbuf) == 0)
-	if (sbuf.st_dev == tbuf.st_dev && sbuf.st_ino == tbuf.st_ino)
-	    return 1;
+    if (stat((s = unmeta(s)), &sbuf) == 0 && stat(".", &tbuf) == 0)
+	if (sbuf.st_dev == tbuf.st_dev && sbuf.st_ino == tbuf.st_ino) {
+	    /* POSIX: No element of $PWD may be "." or ".." */
+	    while (*s) {
+		if (s[0] == '.' &&
+		    (!s[1] || s[1] == '/' ||
+		     (s[1] == '.' && (!s[2] || s[2] == '/'))))
+		    break;
+		while (*s++ != '/' && *s)
+		    continue;
+	    }
+	    return !*s;
+	}
     return 0;
 }