POSIX Spawn 2: Electric Boogaloo

binding.gyp

@@ -46,33 +46,51 @@
         }
       ]
     }, { # 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',
+          ],
+          'conditions': [
+            ['OS=="mac"', {
+              "xcode_settings": {
+                "MACOSX_DEPLOYMENT_TARGET":"10.7"
+              }
+            }]
+          ]
+        },
+        {
+          'target_name': 'pty',
+          'include_dirs' : [
+            '<!(node -e "require(\'nan\')")'
+          ],
+          'sources': [
+            'src/unix/pty.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/interfaces.ts

@@ -109,6 +109,7 @@ interface IBasePtyForkOptions {
 export interface IPtyForkOptions extends IBasePtyForkOptions {
   uid?: number;
   gid?: number;
+  closeFDs?: boolean;
 }
 
 export interface IWindowsPtyForkOptions extends IBasePtyForkOptions {

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, closeFDs: boolean, 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.h

@@ -0,0 +1,5 @@
+#define COMM_PIPE_FD (STDERR_FILENO + 1)
+#define COMM_ERR_EXEC 1
+#define COMM_ERR_CHDIR 2
+#define COMM_ERR_SETUID 3
+#define COMM_ERR_SETGID 4