am 8ac50107: merge from open-source master

Merge commit '8ac50107a21b96f6e9c77ab23820d164543c5bbe' into kraken

* commit '8ac50107a21b96f6e9c77ab23820d164543c5bbe':
  Allow 'adb pull' to pull symlinked files
This commit is contained in:
The Android Open Source Project 2010-04-16 12:39:52 -07:00 committed by Android Git Automerger
commit 34bff9ae7a
1 changed files with 1 additions and 1 deletions

View File

@ -959,7 +959,7 @@ int do_sync_pull(const char *rpath, const char *lpath)
return 1;
}
if(S_ISREG(mode) || S_ISCHR(mode) || S_ISBLK(mode)) {
if(S_ISREG(mode) || S_ISLNK(mode) || S_ISCHR(mode) || S_ISBLK(mode)) {
if(stat(lpath, &st) == 0) {
if(S_ISDIR(st.st_mode)) {
/* if we're copying a remote file to a local directory,