diff options
author | Christopher Tate <ctate@google.com> | 2011-12-08 19:04:34 -0800 |
---|---|---|
committer | Christopher Tate <ctate@google.com> | 2011-12-09 15:29:30 -0800 |
commit | b1dfffe6bb506313a3bc9146d2f6f8c533213193 (patch) | |
tree | 1ff754eecebfb3a4b2bae9cdcf8734d007ad448e | |
parent | ce48083fc90cee807dd66608e2c3e496145af9ff (diff) | |
download | system_core-b1dfffe6bb506313a3bc9146d2f6f8c533213193.zip system_core-b1dfffe6bb506313a3bc9146d2f6f8c533213193.tar.gz system_core-b1dfffe6bb506313a3bc9146d2f6f8c533213193.tar.bz2 |
Fix 'adb backup' on Windows
Use the same call sequence that 'adb pull' uses for creating the
output file. adb_open_mode() apparently does not work on Windows
hosts.
Bug 5733007
Change-Id: I48d719c4657c93e19f6790cf1c6da610d49f5806
-rw-r--r-- | adb/commandline.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/adb/commandline.c b/adb/commandline.c index 4c15232..ffc120f 100644 --- a/adb/commandline.c +++ b/adb/commandline.c @@ -577,9 +577,29 @@ static int logcat(transport_type transport, char* serial, int argc, char **argv) return 0; } +static int mkdirs(char *path) +{ + int ret; + char *x = 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, char** argv) { char buf[4096]; - const char* filename = "./backup.ab"; + char default_name[32]; + const char* filename = strcpy(default_name, "./backup.ab"); int fd, outFd; int i, j; @@ -602,7 +622,9 @@ static int backup(int argc, char** argv) { /* bare "adb backup" or "adb backup -f filename" are not valid invocations */ if (argc < 2) return usage(); - outFd = adb_open_mode(filename, O_WRONLY | O_CREAT | O_TRUNC, 0640); + adb_unlink(filename); + mkdirs((char *)filename); + outFd = adb_creat(filename, 0640); if (outFd < 0) { fprintf(stderr, "adb: unable to open file %s\n", filename); return -1; |