commit 92df258168f0b9f49306ddd9151e7f2fe766f5bc
author Elliott Hughes <enh@google.com> Thu Jul 16 21:52:07 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 16 21:52:07 2015 +0000
tree 20bd88d9a3d31cd3471fcae0e9429ebd0dd50419
parent b096fa9c193aef5517614aa8dee4dc5fcd84bb88
parent c7d20fc939ec562876759d3c4153baa2f4a9512f

am 0c27d276: am c06c3001: am a1c344b9: Merge "Move mkdirs to adb_utils."

* commit '0c27d276d1917821aa41ebe5660dabb7e732ff19':
  Move mkdirs to adb_utils.

adb/adb_utils.cpp

diff --git a/adb/adb_utils.cpp b/adb/adb_utils.cpp
index 604bd57..4b97a14 100644
--- a/adb/adb_utils.cpp
+++ b/adb/adb_utils.cpp
@@ -63,6 +63,25 @@
   return result;
 }
 
+int mkdirs(const char *path)
+{
+    int ret;
+    char *x = (char *)path + 1;
+
+    for(;;) {
+        x = adb_dirstart(x);
+        if(x == 0) return 0;
+        *x = 0;
+        ret = adb_mkdir(path, 0775);
+        *x = OS_PATH_SEPARATOR;
+        if((ret < 0) && (errno != EEXIST)) {
+            return ret;
+        }
+        x++;
+    }
+    return 0;
+}
+
 void dump_hex(const void* data, size_t byte_count) {
     byte_count = std::min(byte_count, size_t(16));
 

adb/adb_utils.h

diff --git a/adb/adb_utils.h b/adb/adb_utils.h
index 84f7d0c..c816d00 100644
--- a/adb/adb_utils.h
+++ b/adb/adb_utils.h
@@ -22,6 +22,8 @@
 bool getcwd(std::string* cwd);
 bool directory_exists(const std::string& path);
 
+int mkdirs(const char *path);
+
 std::string escape_arg(const std::string& s);
 
 void dump_hex(const void* ptr, size_t byte_count);

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index 81ad1bd..6bebf56 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -732,25 +732,6 @@
     return send_shell_command(transport, serial, cmd);
 }
 
-static int mkdirs(const char *path)
-{
-    int ret;
-    char *x = (char *)path + 1;
-
-    for(;;) {
-        x = adb_dirstart(x);
-        if(x == 0) return 0;
-        *x = 0;
-        ret = adb_mkdir(path, 0775);
-        *x = OS_PATH_SEPARATOR;
-        if((ret < 0) && (errno != EEXIST)) {
-            return ret;
-        }
-        x++;
-    }
-    return 0;
-}
-
 static int backup(int argc, const char** argv) {
     const char* filename = "./backup.ab";
 

adb/file_sync_client.cpp

diff --git a/adb/file_sync_client.cpp b/adb/file_sync_client.cpp
index 1dc711ae..49d42a3 100644
--- a/adb/file_sync_client.cpp
+++ b/adb/file_sync_client.cpp
@@ -32,6 +32,7 @@
 #include "adb.h"
 #include "adb_client.h"
 #include "adb_io.h"
+#include "adb_utils.h"
 #include "file_sync_service.h"
 
 static unsigned long long total_bytes;
@@ -395,25 +396,6 @@
     return -1;
 }
 
-static int mkdirs(const char *name)
-{
-    int ret;
-    char *x = (char *)name + 1;
-
-    for(;;) {
-        x = adb_dirstart(x);
-        if(x == 0) return 0;
-        *x = 0;
-        ret = adb_mkdir(name, 0775);
-        *x = OS_PATH_SEPARATOR;
-        if((ret < 0) && (errno != EEXIST)) {
-            return ret;
-        }
-        x++;
-    }
-    return 0;
-}
-
 static int sync_recv(int fd, const char* rpath, const char* lpath, int show_progress) {
     syncmsg msg;
     int len;