commit 771161e7930499d88c396d6f4cbf53dc10d9b2f0
author David Anderson <dvander@google.com> Wed Aug 22 04:32:49 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 22 04:32:49 2018 -0700
tree cfc5079f407074caa2d4976894edff3b6939e401
parent b3e1fbb67dbc927044d844971d87e5d7a5cdb4aa
parent e105c4996fdbcdebad7444e53287532ca87a48d8

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

Change-Id: Id4244f83eaf4fb8b1fdb2156d6f780bc2702804e

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;
 }