fix: which should use cwd if given a relative filepath
#9761
Conversation
| @@ -1642,7 +1642,7 @@ pub const Subprocess = struct { | |||
|
|
|||
| if (argv0 == null) { | |||
| var path_buf: [bun.MAX_PATH_BYTES]u8 = undefined; | |||
| const resolved = Which.which(&path_buf, PATH, arg0.slice()) orelse { | |||
| const resolved = Which.which(&path_buf, PATH, cwd, arg0.slice()) orelse { | |||
There was a problem hiding this comment.
should this cwd be the one on line 1709?
There was a problem hiding this comment.
this was from reverting #9691. i'll look if this is correct code.
src/which.zig
Outdated
| @@ -133,7 +140,20 @@ fn whichWin(buf: *bun.WPathBuffer, path: []const u8, bin: []const u8) ?[:0]const | |||
| return searchBin(buf, bin_utf16.len, check_windows_extensions); | |||
| } | |||
|
|
|||
| if (path.len == 0) return null; | |||
| // check if bin is in cwd | |||
| if (bun.strings.containsChar(bin, '/')) { | |||
There was a problem hiding this comment.
I think these should be backslashes because this is the windows version. Or maybe we should accept both?
| buf, | ||
| &path_buf, | ||
| cwd, | ||
| bun.strings.withoutPrefixComptime(bin, "./"), |
There was a problem hiding this comment.
this was from reverting #9691. i'll look if this is correct code.
| @@ -145,3 +165,14 @@ fn whichWin(buf: *bun.WPathBuffer, path: []const u8, bin: []const u8) ?[:0]const | |||
|
|
|||
| return null; | |||
| } | |||
|
|
|||
| test "which" { | |||
There was a problem hiding this comment.
I'm excited to get zig tests working
There was a problem hiding this comment.
this was from reverting #9691. i don't think we'll get the zigtests working
|
❌ @autofix-ci[bot] 2 files with test failures on linux-x64: |
|
❌ @autofix-ci[bot] 13 files with test failures on bun-windows-x86_64-haswell
|
|
❌ @autofix-ci[bot] 4 files with test failures on bun-darwin-aarch64: |
|
❌ @autofix-ci[bot] 3 files with test failures on bun-darwin-x64: |
|
which test is failing on windows |
|
❌ @autofix-ci[bot] 3 files with test failures on linux-x64-baseline: |
What does this PR do?
This corrects a logic mistake in my previous PR to fix
Bun.whichDoing
which node_modules/.bin/nextshould result in the relative path join of cwd and the path, which happens specifically because there are slashes in the path. A path without slashes is treated as a command name, and that is looked up in PATH.You can verify this new logic is correct by looking at the
whichcommand's output.