authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-12-01 21:31:00-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-12-01 21:31:00-05:00
log3644e85091c2407ddb563531875a6bc5e979e32e
treeeac8900e0e9544c6cff08035ccffed0289c85974
parent37caa56fbc04d314aa8fe5df6bc80c42d879dd7e

fix regressions on windows

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

lib/std/child_process.zig+3-3
...@@ -571,7 +571,7 @@ pub const ChildProcess = struct {...@@ -571,7 +571,7 @@ pub const ChildProcess = struct {
571 // to match posix semantics571 // to match posix semantics
572 const app_name = x: {572 const app_name = x: {
573 if (self.cwd) |cwd| {573 if (self.cwd) |cwd| {
574 const resolved = try fs.path.resolve(self.allocator, [_][]const u8{ cwd, self.argv[0] });574 const resolved = try fs.path.resolve(self.allocator, &[_][]const u8{ cwd, self.argv[0] });
575 defer self.allocator.free(resolved);575 defer self.allocator.free(resolved);
576 break :x try cstr.addNullByte(self.allocator, resolved);576 break :x try cstr.addNullByte(self.allocator, resolved);
577 } else {577 } else {
...@@ -613,10 +613,10 @@ pub const ChildProcess = struct {...@@ -613,10 +613,10 @@ pub const ChildProcess = struct {
613 retry: while (it.next()) |search_path| {613 retry: while (it.next()) |search_path| {
614 var ext_it = mem.tokenize(PATHEXT, ";");614 var ext_it = mem.tokenize(PATHEXT, ";");
615 while (ext_it.next()) |app_ext| {615 while (ext_it.next()) |app_ext| {
616 const app_basename = try mem.concat(self.allocator, u8, [_][]const u8{ app_name[0 .. app_name.len - 1], app_ext });616 const app_basename = try mem.concat(self.allocator, u8, &[_][]const u8{ app_name[0 .. app_name.len - 1], app_ext });
617 defer self.allocator.free(app_basename);617 defer self.allocator.free(app_basename);
618618
619 const joined_path = try fs.path.join(self.allocator, [_][]const u8{ search_path, app_basename });619 const joined_path = try fs.path.join(self.allocator, &[_][]const u8{ search_path, app_basename });
620 defer self.allocator.free(joined_path);620 defer self.allocator.free(joined_path);
621621
622 const joined_path_w = try unicode.utf8ToUtf16LeWithNull(self.allocator, joined_path);622 const joined_path_w = try unicode.utf8ToUtf16LeWithNull(self.allocator, joined_path);