From a2a8f95d411451ef80cee7b76eec9c064b312a8d Mon Sep 17 00:00:00 2001
From: Meghan Denny <meghan@bun.sh>
Date: Thu, 21 Mar 2024 21:28:25 -0700
Subject: [PATCH] which: succeed right away if given an absolute path

---
 src/which.zig | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/which.zig b/src/which.zig
index 9e476f9349..2a9d04937c 100644
--- a/src/which.zig
+++ b/src/which.zig
@@ -15,6 +15,20 @@ fn isValid(buf: *bun.PathBuffer, segment: []const u8, bin: []const u8) ?u16 {
 // Like /usr/bin/which but without needing to exec a child process
 // Remember to resolve the symlink if necessary
 pub fn which(buf: *bun.PathBuffer, path: []const u8, cwd: []const u8, bin: []const u8) ?[:0]const u8 {
+
+    // handle absolute paths
+    if (std.fs.path.isAbsolute(bin)) {
+        bun.copy(u8, buf, bin);
+        buf[bin.len] = 0;
+        const binZ: [:0]u8 = buf[0..bin.len :0];
+        if (bun.Environment.isWindows) return binZ;
+        if (bun.sys.isExecutableFilePath(binZ)) return binZ;
+
+        // note that directories are often executable
+        // TODO: should we return null here? What about the case where ytou have
+        //   /foo/bar/baz as a path and you're in /home/jarred?
+    }
+
     if (bun.Environment.os == .windows) {
         var convert_buf: bun.WPathBuffer = undefined;
         const result = whichWin(&convert_buf, path, cwd, bin) orelse return null;
@@ -25,18 +39,6 @@ pub fn which(buf: *bun.PathBuffer, path: []const u8, cwd: []const u8, bin: []con
     }
     if (bin.len == 0) return null;
 
-    // handle absolute paths
-    if (std.fs.path.isAbsolute(bin)) {
-        bun.copy(u8, buf, bin);
-        buf[bin.len] = 0;
-        const binZ: [:0]u8 = buf[0..bin.len :0];
-        if (bun.sys.isExecutableFilePath(binZ)) return binZ;
-
-        // note that directories are often executable
-        // TODO: should we return null here? What about the case where ytou have
-        //   /foo/bar/baz as a path and you're in /home/jarred?
-    }
-
     if (cwd.len > 0) {
         if (isValid(buf, std.mem.trimRight(u8, cwd, std.fs.path.sep_str), bin)) |len| {
             return buf[0..len :0];
@@ -122,14 +124,6 @@ pub fn whichWin(buf: *bun.WPathBuffer, path: []const u8, cwd: []const u8, bin: [
 
     const check_windows_extensions = !endsWithExtension(bin);
 
-    // handle absolute paths
-    if (std.fs.path.isAbsolute(bin)) {
-        const normalized_bin = PosixToWinNormalizer.resolveCWDWithExternalBuf(&path_buf, bin) catch return null;
-        const bin_utf16 = bun.strings.convertUTF8toUTF16InBuffer(buf, normalized_bin);
-        buf[bin_utf16.len] = 0;
-        return searchBin(buf, bin_utf16.len, check_windows_extensions);
-    }
-
     // check if bin is in cwd
     if (searchBinInPath(buf, &path_buf, cwd, bin, check_windows_extensions)) |bin_path| {
         return bin_path;