STDIO API Refactor and windows > 3 stdio support

include/uv-private/uv-win.h

@@ -454,7 +454,7 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s);
   struct uv_process_close_s {             \
     UV_REQ_FIELDS                         \
   } close_req;                            \
-  HANDLE child_stdio[3];                  \
+  void* child_stdio_buffer;               \
   int exit_signal;                        \
   DWORD spawn_errno;                      \
   HANDLE wait_handle;                     \

include/uv.h

@@ -1165,15 +1165,17 @@ UV_EXTERN void uv_freeaddrinfo(struct addrinfo* ai);
 
 /* uv_spawn() options */
 typedef enum {
-  UV_IGNORE        = 0x00,
-  UV_CREATE_PIPE   = 0x01,
-  /*
-   * UV_READABLE_PIPE and UV_WRITABLE_PIPE flags are set from
-   * the child process perspective.
+  UV_IGNORE         = 0x00,
+  UV_CREATE_PIPE    = 0x01,
+  UV_INHERIT_FD     = 0x02,
+  UV_INHERIT_STREAM = 0x04,
+
+  /* When UV_CREATE_PIPE is specified, UV_READABLE_PIPE and UV_WRITABLE_PIPE
+   * determine the direction of flow, from the child process' perspective. Both
+   * flags may be specified to create a duplex data stream.
    */
-  UV_READABLE_PIPE = 0x02,
-  UV_WRITABLE_PIPE = 0x04,
-  UV_RAW_FD        = 0x08
+  UV_READABLE_PIPE  = 0x10,
+  UV_WRITABLE_PIPE  = 0x20
 } uv_stdio_flags;
 
 typedef struct uv_stdio_container_s {
@@ -1219,10 +1221,16 @@ typedef struct uv_process_options_s {
   uv_gid_t gid;
 
   /*
-   * A container of stdio streams (stdin/stdout/stderr)
+   * The `stdio` field points to an array of uv_stdio_container_t structs that
+   * describe the file descriptors that will be made available to the child
+   * process. The convention is that stdio[0] points to stdin, fd 1 is used for
+   * stdout, and fd 2 is stderr.
+   *
+   * Note that on windows file descriptors greater than 2 are available to the
+   * child process only if the child processes uses the MSVCRT runtime.
    */
-  uv_stdio_container_t* stdio;
   int stdio_count;
+  uv_stdio_container_t* stdio;
 } uv_process_options_t;
 
 /*

src/unix/process.c

@@ -140,33 +140,39 @@ int uv__make_pipe(int fds[2], int flags) {
  */
 static int uv__process_init_stdio(uv_stdio_container_t* container, int fds[2],
                                   int writable) {
-  if (container->flags == UV_IGNORE) {
-    return 0;
-  } else if (container->flags & UV_CREATE_PIPE) {
-    assert(container->data.stream != NULL);
+  int fd = -1;
+  switch (container->flags & (UV_IGNORE | UV_CREATE_PIPE | UV_INHERIT_FD |
+                              UV_INHERIT_STREAM)) {
+    case UV_IGNORE:
+      return 0;
+    case UV_CREATE_PIPE:
+      assert(container->data.stream != NULL);
+
+      if (container->data.stream->type != UV_NAMED_PIPE) {
+        errno = EINVAL;
+        return -1;
+      }
 
-    if (container->data.stream->type != UV_NAMED_PIPE) {
-      errno = EINVAL;
-      return -1;
-    }
+      return uv__make_socketpair(fds, 0);
+    case UV_INHERIT_FD:
+    case UV_INHERIT_STREAM:
+      if (container->flags & UV_INHERIT_FD) {
+        fd = container->data.fd;
+      } else {
+        fd = container->data.stream->fd;
+      }
 
-    return uv__make_socketpair(fds, 0);
-  } else if (container->flags & UV_RAW_FD) {
-    if (container->data.fd == -1) {
-      errno = EINVAL;
-      return -1;
-    }
+      if (fd == -1) {
+        errno = EINVAL;
+        return -1;
+      }
 
-    if (writable) {
-      fds[1] = container->data.fd;
-    } else {
-      fds[0] = container->data.fd;
-    }
+      fds[writable ? 1 : 0] = fd;
 
-    return 0;
-  } else {
-    assert(0 && "Unexpected flags");
-    return -1;
+      return 0;
+    default:
+      assert(0 && "Unexpected flags");
+      return -1;
   }
 }