commit 4ba5c3c7de8cc622ddebc5029a059b1e51bfa294
author David Anderson <dvander@google.com> Tue Aug 21 22:42:11 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 21 22:42:11 2018 -0700
tree cfc5079f407074caa2d4976894edff3b6939e401
parent e6c86871f4aa3e2f30440ee6467f272cd0692a46
parent 0115b79cbd7eaba1dcbbd6e3183fd2aec8446546

Merge "recovery: Add "boot-fastboot" command to BCB."
am: 0115b79cbd

Change-Id: Id47df0b7923f6a48f14ad41f11fcf56f7c0f2f1e

recovery_main.cpp

diff --git a/recovery_main.cpp b/recovery_main.cpp
index 99f9650..020a531 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -97,8 +97,13 @@
   }
   stage = std::string(boot.stage);
 
+  std::string boot_command;
   if (boot.command[0] != 0) {
-    std::string boot_command = std::string(boot.command, sizeof(boot.command));
+    if (memchr(boot.command, '\0', sizeof(boot.command))) {
+      boot_command = std::string(boot.command);
+    } else {
+      boot_command = std::string(boot.command, sizeof(boot.command));
+    }
     LOG(INFO) << "Boot command: " << boot_command;
   }
 
@@ -149,6 +154,12 @@
     LOG(ERROR) << "Failed to set BCB message: " << err;
   }
 
+  // Finally, if no arguments were specified, check whether we should boot
+  // into fastboot.
+  if (args.size() == 1 && boot_command == "boot-fastboot") {
+    args.emplace_back("--fastboot");
+  }
+
   return args;
 }