commit 25d31c9f9cfcf5a868e0280db6221e64517b8af1
author Jerry Zhang <zhangjerry@google.com> Thu May 17 14:44:41 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 17 14:44:41 2018 -0700
tree 14fadf8929d56faab3e82f6c82f2702d3557ffc2
parent 4f26e44969cd0604c56baa474092e85b4a3ca624
parent 38d90316b23db3a0fc006d6f0e502b742c4152c1

Merge "recovery: Reset optind to 1 after getopt"
am: 38d90316b2

Change-Id: I06fecd4bc886741901715201b14ff31b6932d05d

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index b1a2900..21f6330 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1049,6 +1049,7 @@
         continue;
     }
   }
+  optind = 1;
 
   printf("stage is [%s]\n", stage.c_str());
   printf("reason is [%s]\n", reason);

recovery_main.cpp

diff --git a/recovery_main.cpp b/recovery_main.cpp
index e21c782..5e82c6c 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -317,6 +317,7 @@
       }
     }
   }
+  optind = 1;
 
   if (locale.empty()) {
     if (has_cache) {