cleanups

Author: matu3ba

lib/std/child_process.zig

@@ -889,16 +889,20 @@ pub const ChildProcess = struct {
             windowsDestroyPipe(g_hChildStd_IN_Rd, g_hChildStd_IN_Wr);
         };
 
+        var tmp_hChildStd_Rd: windows.HANDLE = undefined;
+        var tmp_hChildStd_Wr: windows.HANDLE = undefined;
         var g_hChildStd_OUT_Rd: ?windows.HANDLE = null;
         var g_hChildStd_OUT_Wr: ?windows.HANDLE = null;
         switch (self.stdout_behavior) {
             StdIo.Pipe => {
                 try windowsMakeAsyncPipe(
-                    &g_hChildStd_OUT_Rd,
-                    &g_hChildStd_OUT_Wr,
+                    &tmp_hChildStd_Rd,
+                    &tmp_hChildStd_Wr,
                     &saAttr,
                     PipeDirection.child_to_parent,
                 );
+                g_hChildStd_OUT_Rd.* = tmp_hChildStd_Rd.*;
+                g_hChildStd_OUT_Wr.* = tmp_hChildStd_Wr.*;
             },
             StdIo.Ignore => {
                 g_hChildStd_OUT_Wr = nul_handle;
@@ -919,11 +923,13 @@ pub const ChildProcess = struct {
         switch (self.stderr_behavior) {
             StdIo.Pipe => {
                 try windowsMakeAsyncPipe(
-                    &g_hChildStd_ERR_Rd,
-                    &g_hChildStd_ERR_Wr,
+                    &tmp_hChildStd_Rd,
+                    &tmp_hChildStd_Wr,
                     &saAttr,
                     PipeDirection.child_to_parent,
                 );
+                g_hChildStd_ERR_Rd.* = tmp_hChildStd_Rd.*;
+                g_hChildStd_ERR_Wr.* = tmp_hChildStd_Wr.*;
             },
             StdIo.Ignore => {
                 g_hChildStd_ERR_Wr = nul_handle;

test/standalone/childprocess_extrapipe/child.zig

@@ -11,14 +11,10 @@ pub fn main() !void {
     _ = it.next() orelse unreachable; // skip binary name
     const s_handle = it.next() orelse unreachable;
 
-    var file_handle: std.os.fd_t = file_handle: {
-        if (builtin.target.os.tag == .windows) {
-            var handle_int = try std.fmt.parseInt(usize, s_handle, 10);
-            break :file_handle @intToPtr(windows.HANDLE, handle_int);
-        } else {
-            break :file_handle try std.fmt.parseInt(std.os.fd_t, s_handle, 10);
-        }
-    };
+    var file_handle: std.os.fd_t = if (builtin.target.os.tag == .windows)
+        @intToPtr(windows.HANDLE, try std.fmt.parseInt(usize, s_handle, 10))
+    else
+        try std.fmt.parseInt(std.os.fd_t, s_handle, 10);
     // TODO: Is there a way on Windows to let the Kernel disable inheritance
     // after it is inherited in CreateProcess???
     if (builtin.target.os.tag == .windows) {

test/standalone/childprocess_extrapipe/parent.zig

@@ -32,7 +32,7 @@ pub fn main() !void {
     const child_path = it.next() orelse unreachable;
 
     // use posix convention: 0 read, 1 write
-    var pipe: if (builtin.os.tag == .windows) [2]?windows.HANDLE else [2]os.fd_t = undefined;
+    var pipe: if (builtin.os.tag == .windows) [2]windows.HANDLE else [2]os.fd_t = undefined;
     if (builtin.os.tag == .windows) {
         const saAttr = windows.SECURITY_ATTRIBUTES{
             .nLength = @sizeOf(windows.SECURITY_ATTRIBUTES),
@@ -47,12 +47,7 @@ pub fn main() !void {
 
     // write read side of pipe to string + add to spawn command
     var buf: [handleCharSize]u8 = comptime [_]u8{0} ** handleCharSize;
-    const s_handle =
-        if (builtin.os.tag == .windows)
-        try handleToString(pipe[0].?, &buf)
-    else
-        try handleToString(pipe[0], &buf);
-
+    const s_handle = try handleToString(pipe[0], &buf);
     var child_proc = ChildProcess.init(
         &.{ child_path, s_handle },
         gpa,
@@ -62,15 +57,12 @@ pub fn main() !void {
         if (os.hasPosixSpawn) child_proc.posix_actions = try os.posix_spawn.Actions.init();
         defer if (os.hasPosixSpawn) child_proc.posix_actions.?.deinit();
         if (os.hasPosixSpawn) try child_proc.posix_actions.?.close(pipe[1]); // TODO: This is not closed in child
-        defer if (builtin.os.tag == .windows)
-            os.close(pipe[0].?)
-        else
-            os.close(pipe[0]);
+        defer os.close(pipe[0]);
 
         try child_proc.spawn();
     }
 
-    // call fcntl on Unixes to disable handle inheritance
+    // call fcntl on Unixes to disable handle inheritance (windows one is per default not enabled)
     if (builtin.os.tag != .windows) {
         try std.os.disableFileInheritance(pipe[1]);
     }
@@ -85,11 +77,7 @@ pub fn main() !void {
         try std.testing.expect((fcntl_flags & os.FD_CLOEXEC) != 0);
     }
 
-    var file_out = if (builtin.target.os.tag == .windows)
-        std.fs.File{ .handle = pipe[1].? }
-    else
-        std.fs.File{ .handle = pipe[1] };
-
+    var file_out = std.fs.File{ .handle = pipe[1] };
     defer file_out.close();
     const file_out_writer = file_out.writer();
     try file_out_writer.writeAll("test123\x17"); // ETB = \x17