Add SearchUnaryOptions and SearchNullaryOptions to improve the parsing

of the startup options.

This allows us to do the following:
- Avoid using the product name when reporting startup option parsing errors.
- Passing --bazelrc as a command argument throws an error (fix for issue #1659).

--
PiperOrigin-RevId: 141445030
MOS_MIGRATED_REVID=141445030

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/cpp/workspace_layout.h b/src/main/cpp/workspace_layout.h
index f02371f541..26034ca6e5 100644
--- a/src/main/cpp/workspace_layout.h
+++ b/src/main/cpp/workspace_layout.h
@@ -53,10 +53,12 @@ class WorkspaceLayout {
   static std::string RcBasename();
 
   // Returns the candidate pathnames for the RC files.
-  static void FindCandidateBlazercPaths(const std::string& workspace,
-                                        const std::string& cwd,
-                                        const std::vector<std::string>& args,
-                                        std::vector<std::string>* result);
+  static void FindCandidateBlazercPaths(
+      const std::string& workspace,
+      const std::string& cwd,
+      const std::string& path_to_binary,
+      const std::vector<std::string>& startup_args,
+      std::vector<std::string>* result);
 
   // Returns the candidate pathnames for the RC file in the workspace,
   // the first readable one of which will be chosen.