From de074fe18c3b947059da64c02d5fb17e857b46fd Mon Sep 17 00:00:00 2001
From: Pat Pannuto <pat.pannuto@gmail.com>
Date: Wed, 13 Jul 2016 20:18:22 -0400
Subject: [PATCH 1/2] process: save original argv[0]

For historical and other reasons, node overwrites `argv[0]` on startup.
See
 - 2c6f79c08,
 - https://github.com/nodejs/node/issues/7434
 - https://github.com/nodejs/node/pull/7449
 - https://github.com/nodejs/node/pull/7696

For cases where it may be useful, save the original value of `argv[0]`
in `process.argv0`
---
 doc/api/process.md             | 23 ++++++++++++++++++++---
 lib/internal/bootstrap_node.js |  5 +++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/doc/api/process.md b/doc/api/process.md
index d2f101419d6d48..9f0a953e3a71ce 100644
--- a/doc/api/process.md
+++ b/doc/api/process.md
@@ -452,9 +452,10 @@ added: v0.1.27
 
 The `process.argv` property returns an array containing the command line
 arguments passed when the Node.js process was launched. The first element will
-be [`process.execPath`]. The second element will be the path to the
-JavaScript file being executed. The remaining elements will be any additional
-command line arguments.
+be [`process.execPath`]. See `process.argv0` if access to the original value of
+`argv[0]` is needed.  The second element will be the path to the JavaScript
+file being executed. The remaining elements will be any additional command line
+arguments.
 
 For example, assuming the following script for `process-args.js`:
 
@@ -481,6 +482,22 @@ Would generate the output:
 4: four
 ```
 
+## process.argv0
+<!-- YAML
+added: REPLACEME
+-->
+
+The `process.argv0` property stores a read-only copy of the original value of
+`argv[0]` passed when Node.js starts.
+
+```js
+$ bash -c 'exec -a customArgv0 ./node'
+> process.argv[0]
+'/Volumes/code/external/node/out/Release/node'
+> process.argv0
+'customArgv0'
+```
+
 ## process.chdir(directory)
 <!-- YAML
 added: v0.1.17
diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js
index 35bbc6d67769e0..dc78faa4d57268 100644
--- a/lib/internal/bootstrap_node.js
+++ b/lib/internal/bootstrap_node.js
@@ -50,6 +50,11 @@
 
     _process.setupRawDebug();
 
+    Object.defineProperty(process, 'argv0', {
+      enumerable: true,
+      configurable: false,
+      value: process.argv[0]
+    });
     process.argv[0] = process.execPath;
 
     // There are various modes that Node can run in. The most common two

From c9880e31d997c4945fadc9cf2e0a30ce61ad9930 Mon Sep 17 00:00:00 2001
From: Pat Pannuto <pat.pannuto@gmail.com>
Date: Tue, 12 Jul 2016 22:04:19 -0400
Subject: [PATCH 2/2] child_process: control argv0 for spawned processes

In some cases it useful to control the value of `argv[0]`, c.f.
 - https://github.com/andrewffff/child_process_with_argv0
 - https://github.com/andrep/argv0

This patch adds explicit support for setting the value of `argv[0]`
when spawning a process.
---
 doc/api/child_process.md                       | 10 ++++++++++
 lib/child_process.js                           |  6 +++++-
 .../parallel/test-child-process-spawn-argv0.js | 18 ++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 test/parallel/test-child-process-spawn-argv0.js

diff --git a/doc/api/child_process.md b/doc/api/child_process.md
index e79b411e91eacf..92b36587b38408 100644
--- a/doc/api/child_process.md
+++ b/doc/api/child_process.md
@@ -293,6 +293,8 @@ added: v0.1.90
 * `options` {Object}
   * `cwd` {String} Current working directory of the child process
   * `env` {Object} Environment key-value pairs
+  * `argv0` {String} Explicitly set the value of `argv[0]` sent to the child
+    process. This will be set to `command` if not specified.
   * `stdio` {Array|String} Child's stdio configuration. (See
     [`options.stdio`][`stdio`])
   * `detached` {Boolean} Prepare child to run independently of its parent
@@ -395,6 +397,14 @@ child.on('error', (err) => {
 });
 ```
 
+*Note: Certain platforms (OS X, Linux) will use the value of `argv[0]` for the
+process title while others (Windows, SunOS) will use `command`.*
+
+*Note: Node.js currently overwrites `argv[0]` with `process.execPath` on
+startup, so `process.argv[0]` in a Node.js child process will not match the
+`argv0` parameter passed to `spawn` from the parent, retrieve it with the
+`process.argv0` property instead.*
+
 #### options.detached
 <!-- YAML
 added: v0.7.10
diff --git a/lib/child_process.js b/lib/child_process.js
index 003f6569fa0792..c5fc038c2213cf 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -347,7 +347,11 @@ function normalizeSpawnArguments(file /*, args, options*/) {
     }
   }
 
-  args.unshift(file);
+  if (typeof options.argv0 === 'string') {
+    args.unshift(options.argv0);
+  } else {
+    args.unshift(file);
+  }
 
   var env = options.env || process.env;
   var envPairs = [];
diff --git a/test/parallel/test-child-process-spawn-argv0.js b/test/parallel/test-child-process-spawn-argv0.js
new file mode 100644
index 00000000000000..593ba9e48ce492
--- /dev/null
+++ b/test/parallel/test-child-process-spawn-argv0.js
@@ -0,0 +1,18 @@
+'use strict';
+require('../common');
+const assert = require('assert');
+const cp = require('child_process');
+
+// This test spawns itself with an argument to indicate when it is a child to
+// easily and portably print the value of argv[0]
+if (process.argv[2] === 'child') {
+  console.log(process.argv0);
+  return;
+}
+
+const noArgv0 = cp.spawnSync(process.execPath, [__filename, 'child']);
+assert.strictEqual(noArgv0.stdout.toString().trim(), process.execPath);
+
+const withArgv0 = cp.spawnSync(process.execPath, [__filename, 'child'],
+    {argv0: 'withArgv0'});
+assert.strictEqual(withArgv0.stdout.toString().trim(), 'withArgv0');