src: use generic helper for splitting strings

addaleax · addaleax · commit 8ec3c350f549 · 2019-01-09T00:26:01.000+01:00
PR-URL: #25363 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
diff --git a/src/node.cc b/src/node.cc
@@ -282,9 +282,12 @@ static struct {
     if (per_process::cli_options->trace_event_categories.empty()) {
       tracing_file_writer_ = tracing_agent_->DefaultHandle();
     } else {
+      std::vector<std::string> categories =
+          SplitString(per_process::cli_options->trace_event_categories, ',');
+
       tracing_file_writer_ = tracing_agent_->AddClient(
-          ParseCommaSeparatedSet(
-              per_process::cli_options->trace_event_categories),
+          std::set<std::string>(std::make_move_iterator(categories.begin()),
+                                std::make_move_iterator(categories.end())),
           std::unique_ptr<tracing::AsyncTraceWriter>(
               new tracing::NodeTraceWriter(
                   per_process::cli_options->trace_event_file_pattern)),
@@ -1420,23 +1423,10 @@ void Init(std::vector<std::string>* argv,
 #if !defined(NODE_WITHOUT_NODE_OPTIONS)
   std::string node_options;
   if (credentials::SafeGetenv("NODE_OPTIONS", &node_options)) {
-    std::vector<std::string> env_argv;
-    // [0] is expected to be the program name, fill it in from the real argv.
-    env_argv.push_back(argv->at(0));
-
-    // Split NODE_OPTIONS at each ' ' character.
-    std::string::size_type index = std::string::npos;
-    do {
-      std::string::size_type prev_index = index;
-      index = node_options.find(' ', index + 1);
-      if (index - prev_index == 1) continue;
-
-      const std::string option = node_options.substr(
-          prev_index + 1, index - prev_index - 1);
-      if (!option.empty())
-        env_argv.emplace_back(std::move(option));
-    } while (index != std::string::npos);
-
+    // [0] is expected to be the program name, fill it in from the real argv
+    // and use 'x' as a placeholder while parsing.
+    std::vector<std::string> env_argv = SplitString("x " + node_options, ' ');
+    env_argv[0] = argv->at(0);
 
     ProcessArgv(&env_argv, nullptr, true);
   }
diff --git a/src/util.cc b/src/util.cc
@@ -122,15 +122,15 @@ void GetHumanReadableProcessName(char (*name)[1024]) {
   snprintf(*name, sizeof(*name), "%s[%d]", title, uv_os_getpid());
 }
 
-std::set<std::string> ParseCommaSeparatedSet(const std::string& in) {
-  std::set<std::string> out;
+std::vector<std::string> SplitString(const std::string& in, char delim) {
+  std::vector<std::string> out;
   if (in.empty())
     return out;
   std::istringstream in_stream(in);
   while (in_stream.good()) {
     std::string item;
-    getline(in_stream, item, ',');
-    out.emplace(std::move(item));
+    std::getline(in_stream, item, delim);
+    out.emplace_back(std::move(item));
   }
   return out;
 }
diff --git a/src/util.h b/src/util.h
@@ -523,7 +523,7 @@ struct FunctionDeleter {
 template <typename T, void (*function)(T*)>
 using DeleteFnPtr = typename FunctionDeleter<T, function>::Pointer;
 
-std::set<std::string> ParseCommaSeparatedSet(const std::string& in);
+std::vector<std::string> SplitString(const std::string& in, char delim);
 
 inline v8::MaybeLocal<v8::Value> ToV8Value(v8::Local<v8::Context> context,
                                            const std::string& str,

Original file line number	Diff line number	Diff line change
`@@ -122,15 +122,15 @@ void GetHumanReadableProcessName(char (*name)[1024]) {`
`122`	`122`	`snprintf(name, sizeof(name), "%s[%d]", title, uv_os_getpid());`
`123`	`123`	`}`
`124`	`124`
`125`		`-std::set<std::string> ParseCommaSeparatedSet(const std::string& in) {`
`126`		`- std::set<std::string> out;`
	`125`	`+std::vector<std::string> SplitString(const std::string& in, char delim) {`
	`126`	`+ std::vector<std::string> out;`
`127`	`127`	`if (in.empty())`
`128`	`128`	`return out;`
`129`	`129`	`std::istringstream in_stream(in);`
`130`	`130`	`while (in_stream.good()) {`
`131`	`131`	`std::string item;`
`132`		`- getline(in_stream, item, ',');`
`133`		`- out.emplace(std::move(item));`
	`132`	`+ std::getline(in_stream, item, delim);`
	`133`	`+ out.emplace_back(std::move(item));`
`134`	`134`	`}`
`135`	`135`	`return out;`
`136`	`136`	`}`