src: expose ability to set options

PR-URL: #30466
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: codebytere

src/node.cc

@@ -112,8 +112,6 @@
 namespacenode {
 
 using native_module::NativeModuleEnv;
-using options_parser::kAllowedInEnvironment;
-using options_parser::kDisallowedInEnvironment;
 
 using v8::Boolean;
 using v8::EscapableHandleScope;
@@ -631,7 +629,7 @@ void ResetStdio() {
 intProcessGlobalArgs(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;
 
@@ -641,7 +639,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()) return9;
@@ -803,12 +801,18 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
 return9;
  }
 
-constint exit_code = ProcessGlobalArgs(&env_argv, nullptr, errors, true);
+constint exit_code = ProcessGlobalArgs(&env_argv,
+nullptr,
+ errors,
+kAllowedInEnvironment);
 if (exit_code != 0) return exit_code;
  }
 #endif
 
-constint exit_code = ProcessGlobalArgs(argv, exec_argv, errors, false);
+constint 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.

src/node.h

@@ -219,6 +219,16 @@ NODE_EXTERN void Init(int* argc,
 int* exec_argc,
 constchar*** exec_argv);
 
+enum OptionEnvvarSettings {
+kAllowedInEnvironment,
+kDisallowedInEnvironment
+};
+
+NODE_EXTERNintProcessGlobalArgs(std::vector<std::string>* args,
+ std::vector<std::string>* exec_args,
+ std::vector<std::string>* errors,
+ OptionEnvvarSettings settings);
+
 classNodeArrayBufferAllocator;
 
 // An ArrayBuffer::Allocator class with some Node.js-specific tweaks. If you do

src/node_options.h

@@ -251,11 +251,6 @@ HostPort SplitHostPort(const std::string& arg,
  std::vector<std::string>* errors);
 voidGetOptions(const v8::FunctionCallbackInfo<v8::Value>& args);
 
-enum OptionEnvvarSettings {
-kAllowedInEnvironment,
-kDisallowedInEnvironment
-};
-
 enum OptionType {
 kNoOp,
 kV8Option,

src/node_worker.cc

@@ -16,7 +16,7 @@
 #include<string>
 #include<vector>
 
-using node::options_parser::kDisallowedInEnvironment;
+using node::kDisallowedInEnvironment;
 using v8::Array;
 using v8::ArrayBuffer;
 using v8::Boolean;