commit 6df12a5d42f8e69f45ca2e606624b1aac097ffb7
author Mark Salyzyn <salyzyn@google.com> Tue Sep 01 20:31:29 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 01 20:31:29 2015 +0000
tree bc9932f5211e9eac846dbd0b357f9f7219130231
parent 6d8d1bbf6dec29e99dec2f0101a53c95ae074129
parent 0b1ff94830b222498ea439f09f91b7e252e078f0

am bd44f59f: Merge "logd: worst uid record watermark part deux" into mnc-dr-dev

* commit 'bd44f59f5b1b7d08b5643563b9ab9abfb375e67e':
  logd: worst uid record watermark part deux

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