mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-06 09:50:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

literally means no path search

Browse source 
Unlike loader.c, we need AccessCommand to handle the `.ape` indirection.
So FindCommand stays.
This commit is contained in:
Jōshin 2024-01-07 02:48:26 -05:00
parent 2e3668b430
commit 57435d0283
No known key found for this signature in database
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ape/ape-m1.c
View file

@ -361,12 +361,8 @@ static char FindCommand(struct PathSearcher *ps) {
ps->path[0] = 0; ps->path[0] = 0;
/* paths are always 100% taken literally when a slash exists /* paths are always 100% taken literally when a slash exists
$ ape foo/bar.com arg1 arg2 */ $ ape foo/bar.com arg1 arg2
if (memchr(ps->name, '/', ps->namelen)) { we don't run files in the current directory
return AccessCommand(ps, 0);
}
/* we don't run files in the current directory
$ ape foo.com arg1 arg2 $ ape foo.com arg1 arg2
unless $PATH has an empty string entry, e.g. unless $PATH has an empty string entry, e.g.
$ expert PATH=":/bin" $ expert PATH=":/bin"
@ -374,8 +370,8 @@ static char FindCommand(struct PathSearcher *ps) {
however we will execute this however we will execute this
$ ape - foo.com foo.com arg1 arg2 $ ape - foo.com foo.com arg1 arg2
because cosmo's execve needs it */ because cosmo's execve needs it */
if (ps->literally && AccessCommand(ps, 0)) { if (ps->literally || memchr(ps->name, '/', ps->namelen)) {
return 1; return AccessCommand(ps, 0);
} }
/* otherwise search for name on $PATH */ /* otherwise search for name on $PATH */