authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-10 03:00:25-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-01-10 03:00:25-05:00
loge06a6b9645827fa35cfa388bbea8813206d444ad
tree1ff5495d98532463e5557cbd236d6de126045726
parent3f98756f8542e5ca6b45322f17eb59b74706fb62
parent03e1241b8828ff9e106d46862ca36fcd75cdc3c4
signature Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #4129 from daurnimator/windows-child_process

Fix windows child process creation

1 files changed, 4 insertions(+), 4 deletions(-)

lib/std/child_process.zig+4-4
...@@ -634,12 +634,12 @@ pub const ChildProcess = struct {...@@ -634,12 +634,12 @@ pub const ChildProcess = struct {
634634
635 var it = mem.tokenize(PATH, ";");635 var it = mem.tokenize(PATH, ";");
636 retry: while (it.next()) |search_path| {636 retry: while (it.next()) |search_path| {
637 const path_no_ext = try fs.path.join(self.allocator, &[_][]const u8{ search_path, app_name });
638 defer self.allocator.free(path_no_ext);
639
637 var ext_it = mem.tokenize(PATHEXT, ";");640 var ext_it = mem.tokenize(PATHEXT, ";");
638 while (ext_it.next()) |app_ext| {641 while (ext_it.next()) |app_ext| {
639 const app_basename = try mem.concat(self.allocator, u8, &[_][]const u8{ app_name[0 .. app_name.len - 1], app_ext });642 const joined_path = try mem.concat(self.allocator, u8, &[_][]const u8{ path_no_ext, app_ext });
640 defer self.allocator.free(app_basename);
641
642 const joined_path = try fs.path.join(self.allocator, &[_][]const u8{ search_path, app_basename });
643 defer self.allocator.free(joined_path);643 defer self.allocator.free(joined_path);
644644
645 const joined_path_w = try unicode.utf8ToUtf16LeWithNull(self.allocator, joined_path);645 const joined_path_w = try unicode.utf8ToUtf16LeWithNull(self.allocator, joined_path);