Merge "recovery: Don't report unrecognized option in recovery_main." am: 785d0b4efa am: e9788bc361

am: 7b72231ffa

Change-Id: I0eb3026ec113f196c80dc070b1e704f8038ffe10

recovery_main.cpp

@@ -351,6 +351,12 @@ int main(int argc, char** argv) {
   std::string locale;
   std::string reason;
 
+  // The code here is only interested in the options that signal the intent to start fastbootd or
+  // recovery. Unrecognized options are likely meant for recovery, which will be processed later in
+  // start_recovery(). Suppress the warnings for such -- even if some flags were indeed invalid, the
+  // code in start_recovery() will capture and report them.
+  opterr = 0;
+
   int arg;
   int option_index;
   while ((arg = getopt_long(args_to_parse.size() - 1, args_to_parse.data(), "", OPTIONS,
@@ -374,6 +380,7 @@ int main(int argc, char** argv) {
     }
   }
   optind = 1;
+  opterr = 1;
 
   if (locale.empty()) {
     if (HasCache()) {