Merge "recovery: Don't report unrecognized option in recovery_main."
This commit is contained in:
commit
785d0b4efa
1 changed files with 7 additions and 0 deletions
|
@ -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()) {
|
||||
|
|
Loading…
Reference in a new issue