diff options
Diffstat (limited to 'src/node.cc')
| -rw-r--r-- | src/node.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/node.cc b/src/node.cc index 5379b42b57..91f07e447f 100644 --- a/src/node.cc +++ b/src/node.cc @@ -123,8 +123,6 @@ namespace node { using native_module::NativeModuleEnv; -using options_parser::kAllowedInEnvironment; -using options_parser::kDisallowedInEnvironment; using v8::Boolean; using v8::EscapableHandleScope; @@ -679,7 +677,7 @@ void ResetStdio() { int ProcessGlobalArgs(std::vector<std::string>* args, std::vector<std::string>* exec_args, std::vector<std::string>* errors, - bool is_env) { + OptionEnvvarSettings settings) { // Parse a few arguments which are specific to Node. std::vector<std::string> v8_args; @@ -689,7 +687,7 @@ int ProcessGlobalArgs(std::vector<std::string>* args, exec_args, &v8_args, per_process::cli_options.get(), - is_env ? kAllowedInEnvironment : kDisallowedInEnvironment, + settings, errors); if (!errors->empty()) return 9; @@ -851,12 +849,18 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv, return 9; } - const int exit_code = ProcessGlobalArgs(&env_argv, nullptr, errors, true); + const int exit_code = ProcessGlobalArgs(&env_argv, + nullptr, + errors, + kAllowedInEnvironment); if (exit_code != 0) return exit_code; } #endif - const int exit_code = ProcessGlobalArgs(argv, exec_argv, errors, false); + const int exit_code = ProcessGlobalArgs(argv, + exec_argv, + errors, + kDisallowedInEnvironment); if (exit_code != 0) return exit_code; // Set the process.title immediately after processing argv if --title is set. |