commit 22633f5b9605bbd7d61709b40c4592739c0ed707
author Pat Tjin <pattjin@google.com> Tue Sep 01 21:01:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 01 21:01:40 2015 +0000
tree 7710d77665a1140c8ef5ae77435e4ce096845234
parent 0645b1e2316c4ab3e2ef95ad7c874f1c2c777128
parent 25a770ceb1835fdfcbc2ee90ca784e4dfeb68fc5

am 6442153c: Merge "fastboot: add flashing bootloader commands" into mnc-dr-dev

* commit '6442153cbc673ee2f3799ed56eb4965f09ae40b8':
  fastboot: add flashing bootloader commands

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index fd9953c..374a2e5 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -741,8 +741,10 @@
 
 static int mkdirs(const char *path)
 {
+    std::string holder(path);
+
     int ret;
-    char *x = (char *)path + 1;
+    char *x = &holder[1];
 
     for(;;) {
         x = adb_dirstart(x);
@@ -759,7 +761,7 @@
 }
 
 static int backup(int argc, const char** argv) {
-    const char* filename = "./backup.ab";
+    const char* filename = "backup.ab";
 
     /* find, extract, and use any -f argument */
     for (int i = 1; i < argc; i++) {