summaryrefslogtreecommitdiffstats
path: root/recovery_main.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-07-18 00:05:29 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-07-18 00:05:29 +0200
commitaf80f51151a7ec9402e4818219a74bf9ddfc9076 (patch)
tree5bf35c6deefe6bcaeca33b371719f570a0b1147d /recovery_main.cpp
parentMerge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." am: 624b6b6cd5 (diff)
parentMerge "Fix the arguments passed to getopt_long(3)." (diff)
downloadandroid_bootable_recovery-af80f51151a7ec9402e4818219a74bf9ddfc9076.tar
android_bootable_recovery-af80f51151a7ec9402e4818219a74bf9ddfc9076.tar.gz
android_bootable_recovery-af80f51151a7ec9402e4818219a74bf9ddfc9076.tar.bz2
android_bootable_recovery-af80f51151a7ec9402e4818219a74bf9ddfc9076.tar.lz
android_bootable_recovery-af80f51151a7ec9402e4818219a74bf9ddfc9076.tar.xz
android_bootable_recovery-af80f51151a7ec9402e4818219a74bf9ddfc9076.tar.zst
android_bootable_recovery-af80f51151a7ec9402e4818219a74bf9ddfc9076.zip
Diffstat (limited to '')
-rw-r--r--recovery_main.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/recovery_main.cpp b/recovery_main.cpp
index 5e82c6c1a..c79d7d8d8 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -29,7 +29,6 @@
#include <time.h>
#include <unistd.h>
-#include <algorithm>
#include <string>
#include <vector>
@@ -287,9 +286,7 @@ int main(int argc, char** argv) {
has_cache = volume_for_mount_point(CACHE_ROOT) != nullptr;
std::vector<std::string> args = get_args(argc, argv);
- 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()); });
+ auto args_to_parse = StringVectorToNullTerminatedArray(args);
static constexpr struct option OPTIONS[] = {
{ "locale", required_argument, nullptr, 0 },
@@ -302,7 +299,7 @@ int main(int argc, char** argv) {
int arg;
int option_index;
- while ((arg = getopt_long(args_to_parse.size(), args_to_parse.data(), "", OPTIONS,
+ while ((arg = getopt_long(args_to_parse.size() - 1, args_to_parse.data(), "", OPTIONS,
&option_index)) != -1) {
switch (arg) {
case 't':