commit 901fb2c8113461fe1468bd79998c24f95b848f03
author Jerry Zhang <zhangjerry@google.com> Thu May 17 14:48:15 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 17 14:48:15 2018 -0700
tree 28c8a0c6fda7a46acf1e39b25f58253843f71ee1
parent 6feecf0337c7b242cf052b297f03522dfd2f0fbe
parent 25d31c9f9cfcf5a868e0280db6221e64517b8af1

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

Change-Id: Id2d80584075c3482748e5946d39fe8ef572aea45

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 2360057..ac3e7c6 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1069,6 +1069,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) {