ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 270ebefc: am b2c34ece: Merge "adb: Don\'t clobber block devices during push"

Browse source 
* commit '270ebefc6c0c7937e8bef112a257b25509a1c2b7':
  adb: Don't clobber block devices during push
This commit is contained in:
JP Abgrall 2014-03-08 02:00:30 +00:00 • committed by Android Git Automerger
commit beea8a77a1
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
adb/file_sync_service.c
View file

@ -339,11 +339,14 @@ static int do_send(int s, char *path, char *buffer)
if(!tmp || errno) { if(!tmp || errno) {
mode = 0644; mode = 0644;
is_link = 0; is_link = 0;
} else {
struct stat st;
/* Don't delete files before copying if they are not "regular" */
if(lstat(path, &st) || S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
adb_unlink(path);
}
} }
adb_unlink(path);
#ifdef HAVE_SYMLINKS #ifdef HAVE_SYMLINKS
if(is_link) if(is_link)
ret = handle_send_link(s, path, buffer); ret = handle_send_link(s, path, buffer);