commit 0645b1e2316c4ab3e2ef95ad7c874f1c2c777128
author Mark Salyzyn <salyzyn@google.com> Tue Sep 01 20:31:30 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 01 20:31:30 2015 +0000
tree 9da1007a80695037dace3f36b678956631825aec
parent 6df12a5d42f8e69f45ca2e606624b1aac097ffb7
parent dab530b26597a8d312d74815d581f22aaed399e4

am 3f5c5a1e: Merge "logd: worst uid record watermark part three" into mnc-dr-dev

* commit '3f5c5a1e6986a7cdafc4af10f17ddd631da83e40':
  logd: worst uid record watermark part three

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++) {