diff options
| author | Tao Bao <tbao@google.com> | 2017-01-09 22:35:39 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-09 22:35:39 +0100 |
| commit | fe0a80184cb0942303ac3bae9bdec9af2b6be7fe (patch) | |
| tree | e716cafb2b4282aa9e4b4331ff30f0c907e4d1cc | |
| parent | Merge "Retry ioctl in uncrypt if it returns block# 0" (diff) | |
| parent | Merge "recovery: Fix the argument parsing." (diff) | |
| download | android_bootable_recovery-fe0a80184cb0942303ac3bae9bdec9af2b6be7fe.tar android_bootable_recovery-fe0a80184cb0942303ac3bae9bdec9af2b6be7fe.tar.gz android_bootable_recovery-fe0a80184cb0942303ac3bae9bdec9af2b6be7fe.tar.bz2 android_bootable_recovery-fe0a80184cb0942303ac3bae9bdec9af2b6be7fe.tar.lz android_bootable_recovery-fe0a80184cb0942303ac3bae9bdec9af2b6be7fe.tar.xz android_bootable_recovery-fe0a80184cb0942303ac3bae9bdec9af2b6be7fe.tar.zst android_bootable_recovery-fe0a80184cb0942303ac3bae9bdec9af2b6be7fe.zip | |
| -rw-r--r-- | recovery.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recovery.cpp b/recovery.cpp index 5888c542a..fac241d63 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -322,7 +322,7 @@ static std::vector<std::string> get_args(const int argc, char** const argv) { std::vector<std::string> args(argv, argv + argc); // --- if arguments weren't supplied, look in the bootloader control block - if (argc == 1) { + if (args.size() == 1) { boot.recovery[sizeof(boot.recovery) - 1] = '\0'; // Ensure termination std::string boot_recovery(boot.recovery); std::vector<std::string> tokens = android::base::Split(boot_recovery, "\n"); @@ -338,7 +338,7 @@ static std::vector<std::string> get_args(const int argc, char** const argv) { } // --- if that doesn't work, try the command file (if we have /cache). - if (argc == 1 && has_cache) { + if (args.size() == 1 && has_cache) { std::string content; if (ensure_path_mounted(COMMAND_FILE) == 0 && android::base::ReadFileToString(COMMAND_FILE, &content)) { |