neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into zig-0.14

Browse source
This commit is contained in:
CJ van den Berg 2025-02-20 22:02:59 +01:00
commit 1403636cc2
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/bin_path.zig
View file

@ -28,20 +28,28 @@ fn find_binary_in_path_windows(allocator: std.mem.Allocator, binary_name_: []con
error.EnvironmentVariableNotFound, error.InvalidWtf8 => &.{}, error.EnvironmentVariableNotFound, error.InvalidWtf8 => &.{},
}; };
defer allocator.free(bin_paths); defer allocator.free(bin_paths);
var path = std.ArrayList(u8).init(allocator); const bin_extensions = std.process.getEnvVarOwned(allocator, "PATHEXT") catch |err| switch (err) {
try path.appendSlice(binary_name_); error.OutOfMemory => return error.OutOfMemory,
try path.appendSlice(".exe"); error.EnvironmentVariableNotFound, error.InvalidWtf8 => &.{},
const binary_name = try path.toOwnedSlice(); };
defer allocator.free(binary_name); defer allocator.free(bin_extensions);
var bin_path_iterator = std.mem.splitScalar(u8, bin_paths, std.fs.path.delimiter); var bin_path_iterator = std.mem.splitScalar(u8, bin_paths, std.fs.path.delimiter);
while (bin_path_iterator.next()) |bin_path| { while (bin_path_iterator.next()) |bin_path| {
if (!std.fs.path.isAbsolute(bin_path)) continue; if (!std.fs.path.isAbsolute(bin_path)) continue;
var dir = std.fs.openDirAbsolute(bin_path, .{}) catch continue; var dir = std.fs.openDirAbsolute(bin_path, .{}) catch continue;
defer dir.close(); defer dir.close();
var bin_extensions_iterator = std.mem.splitScalar(u8, bin_extensions, ';');
while (bin_extensions_iterator.next()) |bin_extension| {
var path = std.ArrayList(u8).init(allocator);
try path.appendSlice(binary_name_);
try path.appendSlice(bin_extension);
const binary_name = try path.toOwnedSlice();
defer allocator.free(binary_name);
_ = dir.statFile(binary_name) catch continue; _ = dir.statFile(binary_name) catch continue;
const resolved_binary_path = try std.fs.path.join(allocator, &[_][]const u8{ bin_path, binary_name }); const resolved_binary_path = try std.fs.path.join(allocator, &[_][]const u8{ bin_path, binary_name });
defer allocator.free(resolved_binary_path); defer allocator.free(resolved_binary_path);
return try allocator.dupeZ(u8, resolved_binary_path); return try allocator.dupeZ(u8, resolved_binary_path);
} }
}
return null; return null;
} }