Commit 9be9b8ca902bb7c250a6836c6090af8525464749 | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2024-06-18 07:08:12+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-06-21 15:41:03-04:00
log	9be9b8ca902bb7c250a6836c6090af8525464749
tree	466679045dda3c87042f50e42e763a8cddd079f8
parent	451550e86a1461e814da4eea22f78c6a77ab9308

std.Build.findProgram(): Try with and without the Windows executable extensions.

I renamed std.process.Child.CreateProcessSupportedExtension to WindowsExtension
and made it public to avoid duplicating the list of extensions.

While here, I also improved it to not misreport OOM from std.fs.realpathAlloc()
as a generic failure to find the program, but instead panic like the rest of the
build system does for OOM.

Closes #20314.

2 files changed, 42 insertions(+), 20 deletions(-)

lib
- std
  - Build.zig
  - process
    Child.zig

lib/std/Build.zig+36-15

 @@ -1727,20 +1727,47 @@ pub fn fmt(b: *Build, comptime format: []const u8, args: anytype) []u8 {
     return std.fmt.allocPrint(b.allocator, format, args) catch @panic("OOM");
 }
+fn supportedWindowsProgramExtension(ext: []const u8) bool {
+    inline for (@typeInfo(std.process.Child.WindowsExtension).Enum.fields) |field| {
+        if (std.ascii.eqlIgnoreCase(ext, "." ++ field.name)) return true;
+    }
+    return false;
+}
+fn tryFindProgram(b: *Build, full_path: []const u8) ?[]const u8 {
+    if (fs.realpathAlloc(b.allocator, full_path)) |p| {
+        return p;
+    } else |err| switch (err) {
+        error.OutOfMemory => @panic("OOM"),
+        else => {},
+    }
+    if (builtin.os.tag == .windows) {
+        if (b.graph.env_map.get("PATHEXT")) |PATHEXT| {
+            var it = mem.tokenizeScalar(u8, PATHEXT, fs.path.delimiter);
+            while (it.next()) |ext| {
+                if (!supportedWindowsProgramExtension(ext)) continue;
+                return fs.realpathAlloc(b.allocator, b.fmt("{s}{s}", .{ full_path, ext })) catch |err| switch (err) {
+                    error.OutOfMemory => @panic("OOM"),
+                    else => continue,
+                };
+            }
+        }
+    }
+    return null;
+}
 pub fn findProgram(b: *Build, names: []const []const u8, paths: []const []const u8) ![]const u8 {
     // TODO report error for ambiguous situations
-    const exe_extension = b.graph.host.result.exeFileExt();
     for (b.search_prefixes.items) |search_prefix| {
         for (names) |name| {
             if (fs.path.isAbsolute(name)) {
                 return name;
             }
-            const full_path = b.pathJoin(&.{
+            return tryFindProgram(b, b.pathJoin(&.{ search_prefix, "bin", name })) orelse continue;
-                search_prefix,
-                "bin",
-                b.fmt("{s}{s}", .{ name, exe_extension }),
-            });
-            return fs.realpathAlloc(b.allocator, full_path) catch continue;
         }
     }
     if (b.graph.env_map.get("PATH")) |PATH| {
 @@ -1750,10 +1777,7 @@ pub fn findProgram(b: *Build, names: []const []const u8, paths: []const []const
             }
             var it = mem.tokenizeScalar(u8, PATH, fs.path.delimiter);
             while (it.next()) |p| {
-                const full_path = b.pathJoin(&.{
+                return tryFindProgram(b, b.pathJoin(&.{ p, name })) orelse continue;
-                    p, b.fmt("{s}{s}", .{ name, exe_extension }),
-                });
-                return fs.realpathAlloc(b.allocator, full_path) catch continue;
             }
         }
     }
 @@ -1762,10 +1786,7 @@ pub fn findProgram(b: *Build, names: []const []const u8, paths: []const []const
             return name;
         }
         for (paths) |p| {
-            const full_path = b.pathJoin(&.{
+            return tryFindProgram(b, b.pathJoin(&.{ p, name })) orelse continue;
-                p, b.fmt("{s}{s}", .{ name, exe_extension }),
-            });
-            return fs.realpathAlloc(b.allocator, full_path) catch continue;
         }
     }
     return error.FileNotFound;

lib/std/process/Child.zig+6-5

...	@@ -1103,7 +1103,7 @@ fn windowsCreateProcessPathExt(	...	@@ -1103,7 +1103,7 @@ fn windowsCreateProcessPathExt(
1103	}	1103	}
1104	var io_status: windows.IO_STATUS_BLOCK = undefined;	1104	var io_status: windows.IO_STATUS_BLOCK = undefined;
1105		1105
1106	const num_supported_pathext = @typeInfo(CreateProcessSupportedExtension).Enum.fields.len;	1106	const num_supported_pathext = @typeInfo(WindowsExtension).Enum.fields.len;
1107	var pathext_seen = [_]bool{false} ** num_supported_pathext;	1107	var pathext_seen = [_]bool{false} ** num_supported_pathext;
1108	var any_pathext_seen = false;	1108	var any_pathext_seen = false;
1109	var unappended_exists = false;	1109	var unappended_exists = false;
...	@@ -1389,8 +1389,9 @@ fn windowsMakeAsyncPipe(rd: ?windows.HANDLE, wr: ?windows.HANDLE, sattr: *cons	...	@@ -1389,8 +1389,9 @@ fn windowsMakeAsyncPipe(rd: ?windows.HANDLE, wr: ?windows.HANDLE, sattr: *cons
1389		1389
1390	var pipe_name_counter = std.atomic.Value(u32).init(1);	1390	var pipe_name_counter = std.atomic.Value(u32).init(1);
1391		1391
1392	// Should be kept in sync with `windowsCreateProcessSupportsExtension`	1392	/// File name extensions supported natively by `CreateProcess()` on Windows.
1393	const CreateProcessSupportedExtension = enum {	1393	// Should be kept in sync with `windowsCreateProcessSupportsExtension`.
		1394	pub const WindowsExtension = enum {
1394	bat,	1395	bat,
1395	cmd,	1396	cmd,
1396	com,	1397	com,
...	@@ -1398,7 +1399,7 @@ const CreateProcessSupportedExtension = enum {	...	@@ -1398,7 +1399,7 @@ const CreateProcessSupportedExtension = enum {
1398	};	1399	};
1399		1400
1400	/// Case-insensitive WTF-16 lookup	1401	/// Case-insensitive WTF-16 lookup
1401	fn windowsCreateProcessSupportsExtension(ext: []const u16) ?CreateProcessSupportedExtension {	1402	fn windowsCreateProcessSupportsExtension(ext: []const u16) ?WindowsExtension {
1402	if (ext.len != 4) return null;	1403	if (ext.len != 4) return null;
1403	const State = enum {	1404	const State = enum {
1404	start,	1405	start,
...	@@ -1457,7 +1458,7 @@ fn windowsCreateProcessSupportsExtension(ext: []const u16) ?CreateProcessSupport	...	@@ -1457,7 +1458,7 @@ fn windowsCreateProcessSupportsExtension(ext: []const u16) ?CreateProcessSupport
1457	}	1458	}
1458		1459
1459	test windowsCreateProcessSupportsExtension {	1460	test windowsCreateProcessSupportsExtension {
1460	try std.testing.expectEqual(CreateProcessSupportedExtension.exe, windowsCreateProcessSupportsExtension(&[_]u16{ '.', 'e', 'X', 'e' }).?);	1461	try std.testing.expectEqual(WindowsExtension.exe, windowsCreateProcessSupportsExtension(&[_]u16{ '.', 'e', 'X', 'e' }).?);
1461	try std.testing.expect(windowsCreateProcessSupportsExtension(&[_]u16{ '.', 'e', 'X', 'e', 'c' }) == null);	1462	try std.testing.expect(windowsCreateProcessSupportsExtension(&[_]u16{ '.', 'e', 'X', 'e', 'c' }) == null);
1462	}	1463	}
1463		1464