POSIX Spawn 2: Electric Boogaloo

binding.gyp

@@ -46,33 +46,49 @@
         }
       ]
     }, { # OS!="win"
-      'targets': [{
-        'target_name': 'pty',
-        'include_dirs' : [
-          '<!(node -e "require(\'nan\')")'
-        ],
-        'sources': [
-          'src/unix/pty.cc'
-        ],
-        'libraries': [
-          '-lutil'
-        ],
-        'conditions': [
-          # http://www.gnu.org/software/gnulib/manual/html_node/forkpty.html
-          #   One some systems (at least including Cygwin, Interix,
-          #   OSF/1 4 and 5, and Mac OS X) linking with -lutil is not required.
-          ['OS=="mac" or OS=="solaris"', {
-            'libraries!': [
-              '-lutil'
-            ]
-          }],
-          ['OS=="mac"', {
-            "xcode_settings": {
-              "MACOSX_DEPLOYMENT_TARGET":"10.7"
-            }
-          }]
-        ]
-      }]
+      'targets': [
+        {
+          'target_name': 'spawn-helper',
+          'type': 'executable',
+          'cflags': ['-Wall'],
+          'sources': [
+            'src/unix/spawn-helper.cc',
+            'src/unix/comms.cc'
+          ],
+          'libraries': [
+            '-lpthread'
+          ],
+        },
+        {
+          'target_name': 'pty',
+          'include_dirs' : [
+            '<!(node -e "require(\'nan\')")'
+          ],
+          'sources': [
+            'src/unix/pty.cc',
+            'src/unix/comms.cc'
+          ],
+          'libraries': [
+            '-lutil'
+          ],
+          'cflags': ['-Wall'],
+          'conditions': [
+            # http://www.gnu.org/software/gnulib/manual/html_node/forkpty.html
+            #   One some systems (at least including Cygwin, Interix,
+            #   OSF/1 4 and 5, and Mac OS X) linking with -lutil is not required.
+            ['OS=="mac" or OS=="solaris"', {
+              'libraries!': [
+                '-lutil'
+              ]
+            }],
+            ['OS=="mac"', {
+              "xcode_settings": {
+                "MACOSX_DEPLOYMENT_TARGET":"10.7"
+              }
+            }]
+          ]
+        }
+      ]
     }]
   ]
 }

scripts/post-install.js

@@ -9,6 +9,7 @@ var BUILD_FILES = [
   path.join(RELEASE_DIR, 'conpty_console_list.pdb'),
   path.join(RELEASE_DIR, 'pty.node'),
   path.join(RELEASE_DIR, 'pty.pdb'),
+  path.join(RELEASE_DIR, 'spawn-helper'),
   path.join(RELEASE_DIR, 'winpty-agent.exe'),
   path.join(RELEASE_DIR, 'winpty-agent.pdb'),
   path.join(RELEASE_DIR, 'winpty.dll'),

src/native.d.ts

@@ -18,7 +18,7 @@ interface IWinptyNative {
 }
 
 interface IUnixNative {
-  fork(file: string, args: string[], parsedEnv: string[], cwd: string, cols: number, rows: number, uid: number, gid: number, useUtf8: boolean, onExitCallback: (code: number, signal: number) => void): IUnixProcess;
+  fork(file: string, args: string[], parsedEnv: string[], cwd: string, cols: number, rows: number, uid: number, gid: number, useUtf8: boolean, onExitCallback: (code: number, signal: number) => void, helperPath: string): IUnixProcess;
   open(cols: number, rows: number): IUnixOpenProcess;
   process(fd: number, pty: string): string;
   resize(fd: number, cols: number, rows: number): void;

src/unix/comms.cc

@@ -0,0 +1,55 @@
+#include "comms.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+
+
+void comm_send_int(int fd, int data) {
+  send(fd, &data, sizeof(data), 0);
+}
+
+void comm_send_str(int fd, char *str) {
+  comm_send_int(fd, strlen(str));
+  send(fd, str, strlen(str), 0);
+}
+
+void comm_send_str_array(int fd, char **arr) {
+  int len = 0;
+  auto p = arr;
+  while (*p) {
+    len++;
+    p++;
+  }
+
+  comm_send_int(fd, len);
+  p = arr;
+  while (*p) {
+    comm_send_str(fd, *p);
+    p++;
+  }
+}
+
+int comm_recv_int(int fd) {
+  int buf;
+  recv(fd, &buf, sizeof(buf), 0);
+  return buf;
+}
+
+char* comm_recv_str(int fd) {
+  int len = comm_recv_int(fd);
+  auto buf = new char[len + 1];
+  recv(fd, buf, len, 0);
+  buf[len] = 0;
+  return buf;
+}
+
+char** comm_recv_str_array(int fd) {
+  int len = comm_recv_int(fd);
+  auto buf = new char*[len + 1];
+  buf[len] = nullptr;
+  for (int i = 0; i < len; i++) {
+    buf[i] = comm_recv_str(fd);
+  }
+  return buf;
+}

src/unix/comms.h

@@ -0,0 +1,19 @@
+#define COMM_PTY_FD 0
+#define COMM_PIPE_FD 1
+
+#define COMM_MSG_PATH 1
+#define COMM_MSG_ARGV 2
+#define COMM_MSG_ENV 3
+#define COMM_MSG_CWD 4
+#define COMM_MSG_UID 5
+#define COMM_MSG_GID 6
+#define COMM_MSG_GO_FOR_LAUNCH 99
+
+#define COMM_MSG_EXEC_ERROR 100
+
+void comm_send_int(int fd, int data);
+void comm_send_str(int fd, char *str);
+void comm_send_str_array(int fd, char **arr);
+int comm_recv_int(int fd);
+char* comm_recv_str(int fd);
+char** comm_recv_str_array(int fd);