Switches to a basic json-like parsing

nodejs · Apr 17, 2019 · 1d3d149 · 1d3d149
1 parent 4025612
commit 1d3d149
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/node.cc b/src/node.cc
@@ -677,14 +677,15 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
     // [0] is expected to be the program name, fill it in from the real argv.
     env_argv.push_back(argv->at(0));
 
+    bool is_in_string = false;
     bool will_start_new_arg = true;
     for (std::string::size_type index = 0;
          index < node_options.size();
          ++index) {
       char c = node_options.at(index);
 
       // Backslashes escape the following character
-      if (c == '\\') {
+      if (c == '\\' && is_in_string) {
         if (index + 1 == node_options.size()) {
           fprintf(stderr,
                   "%s: invalid escaping for NODE_OPTIONS\n",
@@ -693,9 +694,12 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
         } else {
           c = node_options.at(++index);
         }
-      } else if (c == ' ') {
+      } else if (c == ' ' && !is_in_string) {
         will_start_new_arg = true;
         continue;
+      } else if (c == '"') {
+        is_in_string = !is_in_string;
+        continue;
       }
 
       if (will_start_new_arg) {

diff --git a/test/fixtures/print A.js b/test/fixtures/print A.js
@@ -1 +1 @@
-console.log('A');
+console.log('A')
diff --git a/test/parallel/test-cli-node-options.js b/test/parallel/test-cli-node-options.js
@@ -14,9 +14,10 @@ tmpdir.refresh();
 const printA = require.resolve('../fixtures/printA.js');
 const printSpaceA = require.resolve('../fixtures/print A.js');
 
+expect(` -r ${printA} `, 'A\nB\n');
 expect(`-r ${printA}`, 'A\nB\n');
-expect(`-r ${printA.replace(/[a-z]/gi, '\\$&')}`, 'A\nB\n');
-expect(`-r ${printSpaceA.replace(/[\\ ]/g, '\\$&')}`, 'A\nB\n');
+expect(`-r ${JSON.stringify(printA)}`, 'A\nB\n');
+expect(`-r ${JSON.stringify(printSpaceA)}`, 'A\nB\n');
 expect(`-r ${printA} -r ${printA}`, 'A\nB\n');
 expect(`   -r ${printA}    -r ${printA}`, 'A\nB\n');
 expect(`   --require ${printA}    --require ${printA}`, 'A\nB\n');