commit 3da0f756edc6c6e13a5ca4064025f6c20337a954
author Elliott Hughes <enh@google.com> Wed Mar 15 18:40:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 15 18:40:36 2017 +0000
tree 4d1f68e66c856cf53ddc612caad914707d2e6f18
parent 0e3edaf02e62b4649724970b6f9fce9cf15e5e33
parent 5cdbc72543f41cf564797f39989ba9b3a3a0844b

Merge "Move "fastboot oem" to std::string." am: 54182110ae
am: 3547ba5e3f

Change-Id: I72c9ebde8b45df2e1fc9a3d303c0ab6547c6834b

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index a4a0b52..2927b16 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1245,20 +1245,17 @@
     return 0;
 }
 
-static int do_oem_command(int argc, char **argv)
-{
-    char command[256];
+static int do_oem_command(int argc, char** argv) {
     if (argc <= 1) return 0;
 
-    command[0] = 0;
-    while(1) {
-        strcat(command,*argv);
+    std::string command;
+    while (argc > 0) {
+        command += *argv;
         skip(1);
-        if(argc == 0) break;
-        strcat(command," ");
+        if (argc != 0) command += " ";
     }
 
-    fb_queue_command(command,"");
+    fb_queue_command(command.c_str(), "");
     return 0;
 }