tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "recovery: Don't report unrecognized option in recovery_main."

Browse source
This commit is contained in:
Treehugger Robot 2019-09-19 20:07:04 +00:00 committed by Gerrit Code Review
commit 785d0b4efa
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
recovery_main.cpp
View file

@ -351,6 +351,12 @@ int main(int argc, char** argv) {
std::string locale; std::string locale;
std::string reason; 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 arg;
int option_index; int option_index;
while ((arg = getopt_long(args_to_parse.size() - 1, args_to_parse.data(), "", OPTIONS, 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; optind = 1;
opterr = 1;
if (locale.empty()) { if (locale.empty()) {
if (HasCache()) { if (HasCache()) {