From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: Re: Running 'type' causes false positive hashed command completion
Date: Fri, 11 Nov 2016 09:41:01 +0000 [thread overview]
Message-ID: <20161111094101.GA3967@fujitsu.shahaf.local2> (raw)
In-Reply-To: <160825095900.ZM16562@torch.brasslantern.com>
[-- Attachment #1: Type: text/plain, Size: 1206 bytes --]
Bart Schaefer wrote on Thu, Aug 25, 2016 at 09:59:00 -0700:
> On Aug 24, 8:58pm, Daniel Shahaf wrote:
> } Subject: Running 'type' causes false positive hashed command completion
> }
> } $ zsh -f
> } % cd $(mtemp -d)
> } % touch sudofoo; chmod +x $_
> } % ./sudo<TAB>
> } <becomes>
> } % ./sudofoo <^C>
> } % type -w ./sudo
> } ./sudo: none
> } % ./sudo<TAB>
> } ./sudo sudofoo*
> }
> } That's wrong because ./sudo does not exist.
>
> This seems pretty obvious:
>
>
> diff --git a/Src/exec.c b/Src/exec.c
> index ea9214d..9b24d38 100644
> --- a/Src/exec.c
> +++ b/Src/exec.c
> @@ -772,7 +772,7 @@ findcmd(char *arg0, int docopy)
> - if (!cn && isset(HASHCMDS))
> + if (!cn && isset(HASHCMDS) && !isrelative(arg0))
> cn = hashcmd(arg0, path);
>
> Can anyone think of a valid case which that breaks? The doc (under the
> PATH_DIRS option) even says "Commands explicitly beginning with `/', `./'
> or `../' are not subject to the path search."
I've just noticed another bug (predates this patch):
% setopt pathdirs
% ./pwd
zsh: no such file or directory: ./pwd
% type ./pwd
./pwd is /bin/./pwd
That's wrong, 'type' should have returned 'none'.
Patch attached.
Cheers,
Daniel
[-- Attachment #2: 0001-whence-Honor-PATH_DIRS-option-for-arguments-that-sta.patch --]
[-- Type: text/x-diff, Size: 1935 bytes --]
>From d69ba249faeab0e6edb95062482d4f59fde01039 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Fri, 11 Nov 2016 02:25:21 +0000
Subject: [PATCH] whence: Honor PATH_DIRS option for arguments that start with
'./' or '../'.
While here, add some docstrings.
---
Src/exec.c | 23 ++++++++++++++++-------
Test/E01options.ztst | 4 ++++
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Src/exec.c b/Src/exec.c
index a01a633..ad80dd0 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -806,14 +806,13 @@ findcmd(char *arg0, int docopy, int default_path)
cn = hashcmd(arg0, path);
if ((int) strlen(arg0) > PATH_MAX)
return NULL;
- for (s = arg0; *s; s++)
- if (*s == '/') {
- RET_IF_COM(arg0);
- if (arg0 == s || unset(PATHDIRS)) {
- return NULL;
- }
- break;
+ if ((s = strchr(arg0, '/'))) {
+ RET_IF_COM(arg0);
+ if (arg0 == s || unset(PATHDIRS) || !strncmp(arg0, "./", 2) ||
+ !strncmp(arg0, "../", 3)) {
+ return NULL;
}
+ }
if (cn) {
char nn[PATH_MAX];
@@ -848,6 +847,11 @@ findcmd(char *arg0, int docopy, int default_path)
return NULL;
}
+/*
+ * Return TRUE if the given path denotes an executable regular file, or a
+ * symlink to one.
+ */
+
/**/
int
iscom(char *s)
@@ -877,6 +881,11 @@ isreallycom(Cmdnam cn)
return iscom(fullnam);
}
+/*
+ * Return TRUE if the given path contains a dot or dot-dot component
+ * and does not start with a slash.
+ */
+
/**/
int
isrelative(char *s)
diff --git a/Test/E01options.ztst b/Test/E01options.ztst
index 40e96af..45df9f5 100644
--- a/Test/E01options.ztst
+++ b/Test/E01options.ztst
@@ -784,6 +784,10 @@
>unsetting option...
?(eval):14: no such file or directory: pathtestdir/findme
+ (setopt pathdirs; path+=( /usr/bin ); type ./env)
+1:whence honours PATH_DIRS option
+>./env not found
+
setopt posixbuiltins
PATH= command -v print
PATH= command -V print
prev parent reply other threads:[~2016-11-11 9:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-24 20:58 Daniel Shahaf
2016-08-24 21:13 ` Daniel Shahaf
2016-08-25 16:59 ` Bart Schaefer
2016-11-11 9:41 ` Daniel Shahaf [this message]
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=20161111094101.GA3967@fujitsu.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--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).