tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am b1dfffe6: Fix \'adb backup\' on Windows

Browse source 
* commit 'b1dfffe6bb506313a3bc9146d2f6f8c533213193':
  Fix 'adb backup' on Windows
This commit is contained in:
Christopher Tate 2011-12-09 16:56:21 -08:00 committed by Android Git Automerger
commit 650307df33
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
adb/commandline.c
View file

@ -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;