PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "recovery: Fix the argument parsing from COMMAND_FILE."

Browse Source 
am: 332af25b7c

Change-Id: Ib7cdd050d4f20c61ac35c1fb1ad469c5b1c72262
This commit is contained in:
Tao Bao
2016-12-09 19:54:08 +00:00
committed by android-build-merger
parent c3ab25c237 332af25b7c
commit 6be6680109
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
+5 -2
View File
@@ -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));
}