From: Bart Schaefer <schaefer@brasslantern.com>
To: Zsh hackers list <zsh-workers@zsh.org>
Subject: Re: bug with $PWD in /
Date: Sat, 19 Sep 2015 13:47:40 -0700 [thread overview]
Message-ID: <150919134740.ZM23592@torch.brasslantern.com> (raw)
In-Reply-To: <20150919192850.GB6421@chaz.gmail.com>
On Sep 19, 8:28pm, Stephane Chazelas wrote:
} Subject: Re: bug with $PWD in /
}
} So, the should recompute $PWD if the one it gets from the
} environment is a relative path (it's not only about . or ..,
} think of symlinks).
It'd have to be a symlink from the current directory to itself, tho.
Other symbolic links are explicitly permitted by the text you quoted.
This replaces the previous patch, although it's 90% the same.
diff --git a/Src/utils.c b/Src/utils.c
index 1de3d95..ab3b0c2 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -692,9 +692,23 @@ 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;
+ /* POSIX: environment PWD must be absolute */
+ if (*s != '/')
+ return 0;
+
+ 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;
}
next prev parent reply other threads:[~2015-09-19 20:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-16 16:26 Stephane Chazelas
2015-09-16 20:37 ` Bart Schaefer
2015-09-16 20:56 ` Bart Schaefer
2015-09-19 18:08 ` Bart Schaefer
2015-09-19 19:28 ` Stephane Chazelas
2015-09-19 20:47 ` Bart Schaefer [this message]
2015-09-28 18:13 ` Daniel Shahaf
2015-09-28 22:04 ` Bart Schaefer
2015-09-19 20:01 ` Peter Stephenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=150919134740.ZM23592@torch.brasslantern.com \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).