Merge pull request microsoft#588 from microsoft/robo/fix_proc_name

fix: retrieving process name on macOS

Author: Tyriar

src/native.d.ts

@@ -21,6 +21,7 @@ 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;
   open(cols: number, rows: number): IUnixOpenProcess;
   process(fd: number, pty: string): string;
+  process(pid: number): string;
   resize(fd: number, cols: number, rows: number): void;
 }
 

src/unix/pty.cc

@@ -56,7 +56,6 @@
 #include <paths.h>
 #include <spawn.h>
 #include <sys/event.h>
-#include <sys/sysctl.h>
 #include <termios.h>
 #endif
 
@@ -126,8 +125,13 @@ NAN_METHOD(PtyGetProc);
 static int
 pty_nonblock(int);
 
+#if defined(__APPLE__)
+static char *
+pty_getproc(int);
+#else
 static char *
 pty_getproc(int, char *);
+#endif
 
 static void
 pty_waitpid(void *);
@@ -455,6 +459,15 @@ NAN_METHOD(PtyResize) {
 NAN_METHOD(PtyGetProc) {
   Nan::HandleScope scope;
 
+#if defined(__APPLE__)
+  if (info.Length() != 1 ||
+      !info[0]->IsNumber()) {
+    return Nan::ThrowError("Usage: pty.process(pid)");
+  }
+
+  int pid = info[0]->IntegerValue(Nan::GetCurrentContext()).FromJust();
+  char *name = pty_getproc(pid);
+#else
   if (info.Length() != 2 ||
       !info[0]->IsNumber() ||
       !info[1]->IsString()) {
@@ -467,6 +480,7 @@ NAN_METHOD(PtyGetProc) {
   char *tty = strdup(*tty_);
   char *name = pty_getproc(fd, tty);
   free(tty);
+#endif
 
   if (name == NULL) {
     return info.GetReturnValue().SetUndefined();
@@ -663,25 +677,13 @@ pty_getproc(int fd, char *tty) {
 #elif defined(__APPLE__)
 
 static char *
-pty_getproc(int fd, char *tty) {
-  int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, 0 };
-  size_t size;
-  struct kinfo_proc kp;
-
-  if ((mib[3] = tcgetpgrp(fd)) == -1) {
-    return NULL;
-  }
-
-  size = sizeof kp;
-  if (sysctl(mib, 4, &kp, &size, NULL, 0) == -1) {
-    return NULL;
-  }
-
-  if (size != (sizeof kp) || *kp.kp_proc.p_comm == '\0') {
+pty_getproc(int pid) {
+  char pname[MAXCOMLEN + 1];
+  if (!proc_name(pid, pname, sizeof(pname))) {
     return NULL;
   }
 
-  return strdup(kp.kp_proc.p_comm);
+  return strdup(pname);
 }
 
 #else

src/unixTerminal.test.ts

@@ -287,6 +287,12 @@ if (process.platform !== 'win32') {
             done();
           }
         });
+        it('should return the name of the process', (done) => {
+          const term = new UnixTerminal('/bin/echo');
+          assert.strictEqual(term.process, '/bin/echo');
+          term.on('exit', () => done());
+          term.destroy();
+        });
         it('should close on exec', (done) => {
           const data = `
           var pty = require('./lib/index');

src/unixTerminal.ts

@@ -255,6 +255,10 @@ export class UnixTerminal extends Terminal {
    * Gets the name of the process.
    */
   public get process(): string {
+    if (process.platform === 'darwin') {
+      return pty.process(this._pid) || this._file;
+    }
+
     return pty.process(this._fd, this._pty) || this._file;
   }