summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-07-17 07:09:59 +0200
committerTao Bao <tbao@google.com>2018-07-17 21:16:53 +0200
commit1700cc46b5531499b7b532cda05d442f5f60acd4 (patch)
treefa668d92873b1f1d1df22bb992610ea53a69ed49 /recovery.cpp
parentMerge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." (diff)
downloadandroid_bootable_recovery-1700cc46b5531499b7b532cda05d442f5f60acd4.tar
android_bootable_recovery-1700cc46b5531499b7b532cda05d442f5f60acd4.tar.gz
android_bootable_recovery-1700cc46b5531499b7b532cda05d442f5f60acd4.tar.bz2
android_bootable_recovery-1700cc46b5531499b7b532cda05d442f5f60acd4.tar.lz
android_bootable_recovery-1700cc46b5531499b7b532cda05d442f5f60acd4.tar.xz
android_bootable_recovery-1700cc46b5531499b7b532cda05d442f5f60acd4.tar.zst
android_bootable_recovery-1700cc46b5531499b7b532cda05d442f5f60acd4.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/recovery.cpp b/recovery.cpp
index fea65ae9e..3284440da 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -963,10 +963,6 @@ static void log_failure_code(ErrorCode code, const std::string& update_package)
}
Device::BuiltinAction start_recovery(Device* device, const std::vector<std::string>& args) {
- std::vector<char*> args_to_parse(args.size());
- std::transform(args.cbegin(), args.cend(), args_to_parse.begin(),
- [](const std::string& arg) { return const_cast<char*>(arg.c_str()); });
-
static constexpr struct option OPTIONS[] = {
{ "fsck_unshare_blocks", no_argument, nullptr, 0 },
{ "just_exit", no_argument, nullptr, 'x' },
@@ -1002,9 +998,14 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
bool security_update = false;
std::string locale;
+ auto args_to_parse = StringVectorToNullTerminatedArray(args);
+
int arg;
int option_index;
- while ((arg = getopt_long(args_to_parse.size(), args_to_parse.data(), "", OPTIONS,
+ // Parse everything before the last element (which must be a nullptr). getopt_long(3) expects a
+ // null-terminated char* array, but without counting null as an arg (i.e. argv[argc] should be
+ // nullptr).
+ while ((arg = getopt_long(args_to_parse.size() - 1, args_to_parse.data(), "", OPTIONS,
&option_index)) != -1) {
switch (arg) {
case 't':