nodejs
diff --git a/Collapse file
‎lib/internal/process/per_thread.js‎
Copy file name to clipboardExpand all lines: lib/internal/process/per_thread.js
+3-3Lines changed: 3 additions & 3 deletions b/Collapse file
‎lib/internal/process/per_thread.js‎
Copy file name to clipboardExpand all lines: lib/internal/process/per_thread.js
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/Collapse file
‎src/node.cc‎
Copy file name to clipboardExpand all lines: src/node.cc
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎src/node.cc‎
Copy file name to clipboardExpand all lines: src/node.cc
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎src/node.h‎
Copy file name to clipboardExpand all lines: src/node.h
+17-2Lines changed: 17 additions & 2 deletions b/Collapse file
‎src/node.h‎
Copy file name to clipboardExpand all lines: src/node.h
+17-2Lines changed: 17 additions & 2 deletions
diff --git a/Collapse file
‎src/node_options-inl.h‎
Copy file name to clipboardExpand all lines: src/node_options-inl.h
+3-3Lines changed: 3 additions & 3 deletions b/Collapse file
‎src/node_options-inl.h‎
Copy file name to clipboardExpand all lines: src/node_options-inl.h
+3-3Lines changed: 3 additions & 3 deletions
@@ -277,14 +277,14 @@ const trailingValuesRegex = /=.*$/;
 // from data in the config binding.
 function buildAllowedFlags() {
   const {
-    envSettings: { kAllowedInEnvironment },
+    envSettings: { kAllowedInEnvvar },
     types: { kBoolean },
   } = internalBinding('options');
   const { options, aliases } = require('internal/options');
 
   const allowedNodeEnvironmentFlags = [];
   for (const { 0: name, 1: info } of options) {
-    if (info.envVarSettings === kAllowedInEnvironment) {
+    if (info.envVarSettings === kAllowedInEnvvar) {
       ArrayPrototypePush(allowedNodeEnvironmentFlags, name);
       if (info.type === kBoolean) {
         const negatedName = `--no-${name.slice(2)}`;
@@ -301,7 +301,7 @@ function buildAllowedFlags() {
         ArrayPrototypeSplice(recursiveExpansion, 0, 1);
       return ArrayPrototypeEvery(recursiveExpansion, isAccepted);
     }
-    return options.get(to).envVarSettings === kAllowedInEnvironment;
+    return options.get(to).envVarSettings === kAllowedInEnvvar;
   }
   for (const { 0: from, 1: expansion } of aliases) {
     if (ArrayPrototypeEvery(expansion, isAccepted)) {
 
@@ -817,7 +817,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
       const int exit_code = ProcessGlobalArgs(&env_argv,
                                               nullptr,
                                               errors,
-                                              kAllowedInEnvironment);
+                                              kAllowedInEnvvar);
       if (exit_code != 0) return exit_code;
     }
   }
@@ -827,7 +827,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
     const int exit_code = ProcessGlobalArgs(argv,
                                             exec_argv,
                                             errors,
-                                            kDisallowedInEnvironment);
+                                            kDisallowedInEnvvar);
     if (exit_code != 0) return exit_code;
   }
 
 
@@ -361,10 +361,25 @@ inline std::unique_ptr<InitializationResult> InitializeOncePerProcess(
 }
 
 enum OptionEnvvarSettings {
-  kAllowedInEnvironment,
-  kDisallowedInEnvironment
+  // Allow the options to be set via the environment variable, like
+  // `NODE_OPTIONS`.
+  kAllowedInEnvvar = 0,
+  // Disallow the options to be set via the environment variable, like
+  // `NODE_OPTIONS`.
+  kDisallowedInEnvvar = 1,
+  // Deprecated, use kAllowedInEnvvar instead.
+  kAllowedInEnvironment = kAllowedInEnvvar,
+  // Deprecated, use kDisallowedInEnvvar instead.
+  kDisallowedInEnvironment = kDisallowedInEnvvar,
 };
 
+// Process the arguments and set up the per-process options.
+// If the `settings` is set as OptionEnvvarSettings::kAllowedInEnvvar, the
+// options that are allowed in the environment variable are processed. Options
+// that are disallowed to be set via environment variable are processed as
+// errors.
+// Otherwise all the options that are disallowed (and those are allowed) to be
+// set via environment variable are processed.
 NODE_EXTERN int ProcessGlobalArgs(std::vector<std::string>* args,
                       std::vector<std::string>* exec_args,
                       std::vector<std::string>* errors,
 
@@ -302,7 +302,7 @@ void OptionsParser<Options>::Parse(
     const std::string arg = args.pop_first();
 
     if (arg == "--") {
-      if (required_env_settings == kAllowedInEnvironment)
+      if (required_env_settings == kAllowedInEnvvar)
         errors->push_back(NotAllowedInEnvErr("--"));
       break;
     }
@@ -374,8 +374,8 @@ void OptionsParser<Options>::Parse(
     auto it = options_.find(name);
 
     if ((it == options_.end() ||
-         it->second.env_setting == kDisallowedInEnvironment) &&
-        required_env_settings == kAllowedInEnvironment) {
+         it->second.env_setting == kDisallowedInEnvvar) &&
+        required_env_settings == kAllowedInEnvvar) {
       errors->push_back(NotAllowedInEnvErr(original_name));
       break;
     }
Original file line number	Diff line number	Diff line change
`@@ -817,7 +817,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,`
`817`	`817`	`const int exit_code = ProcessGlobalArgs(&env_argv,`
`818`	`818`	`nullptr,`
`819`	`819`	`errors,`
`820`		`- kAllowedInEnvironment);`
	`820`	`+ kAllowedInEnvvar);`
`821`	`821`	`if (exit_code != 0) return exit_code;`
`822`	`822`	`}`
`823`	`823`	`}`
`@@ -827,7 +827,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,`
`827`	`827`	`const int exit_code = ProcessGlobalArgs(argv,`
`828`	`828`	`exec_argv,`
`829`	`829`	`errors,`
`830`		`- kDisallowedInEnvironment);`
	`830`	`+ kDisallowedInEnvvar);`
`831`	`831`	`if (exit_code != 0) return exit_code;`
`832`	`832`	`}`
`833`	`833`