Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109
am: d4ceb1fb64
Change-Id: I0be84193224de80faf8ca32b62bb75180fa03d1f
diff --git a/recovery.cpp b/recovery.cpp
index 5f16075..e16f28c 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -350,9 +350,12 @@
// --- 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));
}