diff options
| author | JP Abgrall <jpa@google.com> | 2014-03-08 02:00:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-08 02:00:30 +0000 |
| commit | beea8a77a1ee191346302315659b7914eefe0d8e (patch) | |
| tree | 7e2fbf39895b39bb8f7fdf1ac4ee9301b035d03a | |
| parent | a4d7f8d4191cc4a74ef99596b19c084c93c58571 (diff) | |
| parent | 270ebefc6c0c7937e8bef112a257b25509a1c2b7 (diff) | |
| download | system_core-beea8a77a1ee191346302315659b7914eefe0d8e.zip system_core-beea8a77a1ee191346302315659b7914eefe0d8e.tar.gz system_core-beea8a77a1ee191346302315659b7914eefe0d8e.tar.bz2 | |
am 270ebefc: am b2c34ece: Merge "adb: Don\'t clobber block devices during push"
* commit '270ebefc6c0c7937e8bef112a257b25509a1c2b7':
adb: Don't clobber block devices during push
| -rw-r--r-- | adb/file_sync_service.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/adb/file_sync_service.c b/adb/file_sync_service.c index e981c2a..25bfdc9 100644 --- a/adb/file_sync_service.c +++ b/adb/file_sync_service.c @@ -339,11 +339,14 @@ static int do_send(int s, char *path, char *buffer) if(!tmp || errno) { mode = 0644; 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 if(is_link) ret = handle_send_link(s, path, buffer); |