mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

39915: whence: Honor PATH_DIRS option for arguments that start with './' or '../'.

Browse source 
While here, add some docstrings.
This commit is contained in:
Daniel Shahaf 2016-11-11 02:25:21 +00:00
parent 0a6098a1d4
commit c392e6c620
3 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2016-11-17 Daniel Shahaf <d.s@daniel.shahaf.name>
* 39915: Src/exec.c, Test/E01options.ztst: whence: Honor
PATH_DIRS option for arguments that start with './' or '../'.
2016-11-17 Oliver Kiddle <opk@zsh.org> 2016-11-17 Oliver Kiddle <opk@zsh.org>
* 39962: Src/Zle/zle_keymap.c: bind vi case conversion widgets * 39962: Src/Zle/zle_keymap.c: bind vi case conversion widgets

23
Src/exec.c
View file

@ -806,14 +806,13 @@ findcmd(char *arg0, int docopy, int default_path)
cn = hashcmd(arg0, path); cn = hashcmd(arg0, path);
if ((int) strlen(arg0) > PATH_MAX) if ((int) strlen(arg0) > PATH_MAX)
return NULL; return NULL;
for (s = arg0; *s; s++) if ((s = strchr(arg0, '/'))) {
if (*s == '/') { RET_IF_COM(arg0);
RET_IF_COM(arg0); if (arg0 == s || unset(PATHDIRS) || !strncmp(arg0, "./", 2) ||
if (arg0 == s || unset(PATHDIRS)) { !strncmp(arg0, "../", 3)) {
return NULL; return NULL;
}
break;
} }
}
if (cn) { if (cn) {
char nn[PATH_MAX]; char nn[PATH_MAX];
@ -848,6 +847,11 @@ findcmd(char *arg0, int docopy, int default_path)
return NULL; return NULL;
} }
/*
* Return TRUE if the given path denotes an executable regular file, or a
* symlink to one.
*/
/**/ /**/
int int
iscom(char *s) iscom(char *s)
@ -877,6 +881,11 @@ isreallycom(Cmdnam cn)
return iscom(fullnam); return iscom(fullnam);
} }
/*
* Return TRUE if the given path contains a dot or dot-dot component
* and does not start with a slash.
*/
/**/ /**/
int int
isrelative(char *s) isrelative(char *s)

4
Test/E01options.ztst
View file

@ -784,6 +784,10 @@
>unsetting option... >unsetting option...
?(eval):14: no such file or directory: pathtestdir/findme ?(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 setopt posixbuiltins
PATH= command -v print PATH= command -v print
PATH= command -V print PATH= command -V print