commit b7ce9c5e00518349dfaf4f90db11abc1377a6cee
author Tao Bao <tbao@google.com> Mon Jan 09 21:40:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 09 21:40:39 2017 +0000
tree 065336ed34d8c14e4c610d09a34288b1c631bee3
parent 5ec75851a7cc753d76c078f59ad31dd04be32ae1
parent fe0a80184cb0942303ac3bae9bdec9af2b6be7fe

Merge "recovery: Fix the argument parsing." am: 33808f16c5
am: fe0a80184c

Change-Id: Id077e40e0fa27fb94fee942e95430eb02c369333

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 5888c54..fac241d 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -322,7 +322,7 @@
   std::vector<std::string> args(argv, argv + argc);
 
   // --- if arguments weren't supplied, look in the bootloader control block
-  if (argc == 1) {
+  if (args.size() == 1) {
     boot.recovery[sizeof(boot.recovery) - 1] = '\0';  // Ensure termination
     std::string boot_recovery(boot.recovery);
     std::vector<std::string> tokens = android::base::Split(boot_recovery, "\n");
@@ -338,7 +338,7 @@
   }
 
   // --- if that doesn't work, try the command file (if we have /cache).
-  if (argc == 1 && has_cache) {
+  if (args.size() == 1 && has_cache) {
     std::string content;
     if (ensure_path_mounted(COMMAND_FILE) == 0 &&
         android::base::ReadFileToString(COMMAND_FILE, &content)) {