summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-12-09 21:04:39 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-12-09 21:04:39 +0100
commit3ab15c4dd82a7ce8916307c85851fc03da5db5f5 (patch)
treed83a9df7015e76006c8e08025d011c13d7253980
parentMerge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237 (diff)
parentMerge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c (diff)
downloadandroid_bootable_recovery-3ab15c4dd82a7ce8916307c85851fc03da5db5f5.tar
android_bootable_recovery-3ab15c4dd82a7ce8916307c85851fc03da5db5f5.tar.gz
android_bootable_recovery-3ab15c4dd82a7ce8916307c85851fc03da5db5f5.tar.bz2
android_bootable_recovery-3ab15c4dd82a7ce8916307c85851fc03da5db5f5.tar.lz
android_bootable_recovery-3ab15c4dd82a7ce8916307c85851fc03da5db5f5.tar.xz
android_bootable_recovery-3ab15c4dd82a7ce8916307c85851fc03da5db5f5.tar.zst
android_bootable_recovery-3ab15c4dd82a7ce8916307c85851fc03da5db5f5.zip
-rw-r--r--recovery.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 5f1607553..e16f28c72 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -350,9 +350,12 @@ 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) {
std::string content;
- if (android::base::ReadFileToString(COMMAND_FILE, &content)) {
+ if (ensure_path_mounted(COMMAND_FILE) == 0 &&
+ android::base::ReadFileToString(COMMAND_FILE, &content)) {
std::vector<std::string> tokens = android::base::Split(content, "\n");
- for (auto it = tokens.begin() + 1; it != tokens.end(); it++) {
+ // All the arguments in COMMAND_FILE are needed (unlike the BCB message,
+ // COMMAND_FILE doesn't use filename as the first argument).
+ for (auto it = tokens.begin(); it != tokens.end(); it++) {
// Skip empty and '\0'-filled tokens.
if (!it->empty() && (*it)[0] != '\0') args.push_back(std::move(*it));
}