src: optimize Dotenv::GetPathFromArgs

Author: avivkeller

src/node_dotenv.cc

@@ -11,31 +11,23 @@ using v8::NewStringType;
 using v8::Object;
 using v8::String;
 
-std::vector<std::string> Dotenv::GetPathFromArgs(
-    const std::vector<std::string>& args) {
-  const auto find_match = [](const std::string& arg) {
-    const std::string_view flag = "--env-file";
-    return strncmp(arg.c_str(), flag.data(), flag.size()) == 0;
-  };
+std::vector<std::string> Dotenv::GetPathFromArgs(const std::vector<std::string>& args) {
+  const std::string_view flag = "--env-file";
   std::vector<std::string> paths;
-  auto path = std::find_if(args.begin(), args.end(), find_match);
 
-  while (path != args.end()) {
-    auto equal_char = path->find('=');
-
-    if (equal_char != std::string::npos) {
-      paths.push_back(path->substr(equal_char + 1));
-    } else {
-      auto next_path = std::next(path);
-
-      if (next_path == args.end()) {
-        return paths;
+  for (size_t i = 0; i < args.size(); ++i) {
+    const std::string_view arg = args[i];
+    if (arg == "--") {
+      break;
+    }
+    if (arg.find(flag) == 0) {
+      if (arg.size() > flag.size() && arg[flag.size()] == '=') {
+        paths.push_back(std::string(arg.substr(flag.size() + 1)));
+      } else if (i + 1 < args.size()) {
+        paths.push_back(args[i + 1]);
+        ++i;
       }
-
-      paths.push_back(*next_path);
     }
-
-    path = std::find_if(++path, args.end(), find_match);
   }
 
   return paths;