summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerry Zhang <zhangjerry@google.com>2018-05-17 23:52:48 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-05-17 23:52:48 +0200
commit76610d1681e8500c8137f877dde41cac3df96356 (patch)
tree28c8a0c6fda7a46acf1e39b25f58253843f71ee1
parentMerge "updater_sample: add switch slot demo" am: 2ddc54f5fd am: 4f26e44969 (diff)
parentMerge "recovery: Reset optind to 1 after getopt" am: 38d90316b2 (diff)
downloadandroid_bootable_recovery-76610d1681e8500c8137f877dde41cac3df96356.tar
android_bootable_recovery-76610d1681e8500c8137f877dde41cac3df96356.tar.gz
android_bootable_recovery-76610d1681e8500c8137f877dde41cac3df96356.tar.bz2
android_bootable_recovery-76610d1681e8500c8137f877dde41cac3df96356.tar.lz
android_bootable_recovery-76610d1681e8500c8137f877dde41cac3df96356.tar.xz
android_bootable_recovery-76610d1681e8500c8137f877dde41cac3df96356.tar.zst
android_bootable_recovery-76610d1681e8500c8137f877dde41cac3df96356.zip
-rw-r--r--recovery.cpp1
-rw-r--r--recovery_main.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 2360057d0..ac3e7c633 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1069,6 +1069,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
continue;
}
}
+ optind = 1;
printf("stage is [%s]\n", stage.c_str());
printf("reason is [%s]\n", reason);
diff --git a/recovery_main.cpp b/recovery_main.cpp
index e21c782d0..5e82c6c1a 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -317,6 +317,7 @@ int main(int argc, char** argv) {
}
}
}
+ optind = 1;
if (locale.empty()) {
if (has_cache) {