mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1919 from Sahnvour/windows-childprocess

Browse Source 
Better behaviour of ChildProcess under windows.
This commit is contained in:
Andrew Kelley 2019-02-05 21:03:33 -05:00 committed by GitHub
commit fd28b9d501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
std/os/child_process.zig
View File

@ -600,7 +600,7 @@ pub const ChildProcess = struct {
const joined_path = try os.path.join(self.allocator, search_path, app_name);
defer self.allocator.free(joined_path);
const joined_path_w = try unicode.utf8ToUtf16LeWithNull(self.allocator, app_name);
const joined_path_w = try unicode.utf8ToUtf16LeWithNull(self.allocator, joined_path);
defer self.allocator.free(joined_path_w);
if (windowsCreateProcess(joined_path_w.ptr, cmd_line_w.ptr, envp_ptr, cwd_w_ptr, &siStartInfo, &piProcInfo)) |_| {
@ -610,6 +610,9 @@ pub const ChildProcess = struct {
} else {
return err;
}
} else {
// Every other error would have been returned earlier.
return error.FileNotFound;
}
};