summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2016-10-19 05:11:11 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-10-19 05:11:11 +0200
commit1889b1bb68f3f290ef6906ecd64e7eef9c84c2ec (patch)
tree496fc9207714e432c70a35b2504f8c204e070fa5
parentMerge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37 am: ece0b68ca6 (diff)
parentMerge "Clean up bootloader_message usage in recovery" am: 94f4494613 (diff)
downloadandroid_bootable_recovery-1889b1bb68f3f290ef6906ecd64e7eef9c84c2ec.tar
android_bootable_recovery-1889b1bb68f3f290ef6906ecd64e7eef9c84c2ec.tar.gz
android_bootable_recovery-1889b1bb68f3f290ef6906ecd64e7eef9c84c2ec.tar.bz2
android_bootable_recovery-1889b1bb68f3f290ef6906ecd64e7eef9c84c2ec.tar.lz
android_bootable_recovery-1889b1bb68f3f290ef6906ecd64e7eef9c84c2ec.tar.xz
android_bootable_recovery-1889b1bb68f3f290ef6906ecd64e7eef9c84c2ec.tar.zst
android_bootable_recovery-1889b1bb68f3f290ef6906ecd64e7eef9c84c2ec.zip
-rw-r--r--recovery.cpp42
1 files changed, 13 insertions, 29 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 88c77d2f8..4d1ad1df2 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -372,25 +372,20 @@ get_args(int *argc, char ***argv) {
// --> write the arguments we have back into the bootloader control block
// always boot into recovery after this (until finish_recovery() is called)
- strlcpy(boot.command, "boot-recovery", sizeof(boot.command));
- strlcpy(boot.recovery, "recovery\n", sizeof(boot.recovery));
- int i;
- for (i = 1; i < *argc; ++i) {
- strlcat(boot.recovery, (*argv)[i], sizeof(boot.recovery));
- strlcat(boot.recovery, "\n", sizeof(boot.recovery));
- }
- if (!write_bootloader_message(boot, &err)) {
+ std::vector<std::string> options;
+ for (int i = 1; i < *argc; ++i) {
+ options.push_back((*argv)[i]);
+ }
+ if (!write_bootloader_message(options, &err)) {
LOG(ERROR) << err;
}
}
static void
set_sdcard_update_bootloader_message() {
- bootloader_message boot = {};
- strlcpy(boot.command, "boot-recovery", sizeof(boot.command));
- strlcpy(boot.recovery, "recovery\n", sizeof(boot.recovery));
+ std::vector<std::string> options;
std::string err;
- if (!write_bootloader_message(boot, &err)) {
+ if (!write_bootloader_message(options, &err)) {
LOG(ERROR) << err;
}
}
@@ -543,9 +538,8 @@ finish_recovery() {
copy_logs();
// Reset to normal system boot so recovery won't cycle indefinitely.
- bootloader_message boot = {};
std::string err;
- if (!write_bootloader_message(boot, &err)) {
+ if (!clear_bootloader_message(&err)) {
LOG(ERROR) << err;
}
@@ -1392,27 +1386,17 @@ static bool is_battery_ok() {
}
static void set_retry_bootloader_message(int retry_count, int argc, char** argv) {
- bootloader_message boot = {};
- strlcpy(boot.command, "boot-recovery", sizeof(boot.command));
- strlcpy(boot.recovery, "recovery\n", sizeof(boot.recovery));
-
+ std::vector<std::string> options;
for (int i = 1; i < argc; ++i) {
if (strstr(argv[i], "retry_count") == nullptr) {
- strlcat(boot.recovery, argv[i], sizeof(boot.recovery));
- strlcat(boot.recovery, "\n", sizeof(boot.recovery));
+ options.push_back(argv[i]);
}
}
- // Initialize counter to 1 if it's not in BCB, otherwise increment it by 1.
- if (retry_count == 0) {
- strlcat(boot.recovery, "--retry_count=1\n", sizeof(boot.recovery));
- } else {
- char buffer[20];
- snprintf(buffer, sizeof(buffer), "--retry_count=%d\n", retry_count+1);
- strlcat(boot.recovery, buffer, sizeof(boot.recovery));
- }
+ // Increment the retry counter by 1.
+ options.push_back(android::base::StringPrintf("--retry_count=%d", retry_count+1));
std::string err;
- if (!write_bootloader_message(boot, &err)) {
+ if (!write_bootloader_message(options, &err)) {
LOG(ERROR) << err;
}
}