commit 1889b1bb68f3f290ef6906ecd64e7eef9c84c2ec
author Tianjie Xu <xunchang@google.com> Wed Oct 19 03:11:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 19 03:11:11 2016 +0000
tree 496fc9207714e432c70a35b2504f8c204e070fa5
parent 4e8d032183d5c036aecc5155d2fa0d994255a386
parent 0ddd07b0bd9bfe1faa462e936146a7abdbda267e

Merge "Clean up bootloader_message usage in recovery" am: 94f4494613 am: 7691800c2e
am: 0ddd07b0bd

Change-Id: I2a58c6a62e79e2d1fce00281755b34610489b474

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 88c77d2..4d1ad1d 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -372,25 +372,20 @@
 
     // --> 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));
+    std::vector<std::string> options;
+    for (int i = 1; i < *argc; ++i) {
+        options.push_back((*argv)[i]);
     }
-    if (!write_bootloader_message(boot, &err)) {
+    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 @@
     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 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;
     }
 }