commit d56e1c6502bab2f79585e08a990360ab1d006101
author Luis Fernando Pino Duque <lpino@google.com> Fri Mar 24 18:04:00 2017 +0000
committer Philipp Wollermann <philwo@google.com> Mon Mar 27 11:36:12 2017 +0000
tree ea88ed379058f41ef8083080841af072299ec5b5
parent 254e3b22d6c33c0b6c3e0f70512fb8c78e06626a

Make Search{Unary,Nullary}Option skip the rest of the args if "--" is found.

--
PiperOrigin-RevId: 151145409
MOS_MIGRATED_REVID=151145409

src/main/cpp/blaze_util.cc

diff --git a/src/main/cpp/blaze_util.cc b/src/main/cpp/blaze_util.cc
index 08f01a2..c45aabc 100644
--- a/src/main/cpp/blaze_util.cc
+++ b/src/main/cpp/blaze_util.cc
@@ -87,6 +87,9 @@
 
   vector<string>::size_type i = 0;
   for (; i < args.size() - 1; ++i) {
+    if (args[i] == "--") {
+      return NULL;
+    }
     const char* result = GetUnaryOption(args[i].c_str(),
                                         args[i + 1].c_str(),
                                         key);
@@ -99,6 +102,9 @@
 
 bool SearchNullaryOption(const vector<string>& args, const char *key) {
   for (vector<string>::size_type i = 0; i < args.size(); i++) {
+    if (args[i] == "--") {
+      return false;
+    }
     if (GetNullaryOption(args[i].c_str(), key)) {
       return true;
     }