commit 34bff9ae7a7fc09b852eaf662933e842822a2bc4
author The Android Open Source Project <initial-contribution@android.com> Fri Apr 16 12:39:52 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 16 12:39:52 2010 -0700
tree 9a94790694e24e8cc517e66bd77e973e8a12c4f4
parent 7ae4e690b0cc17d9fd04014e652febeb06d177d0
parent 8ac50107a21b96f6e9c77ab23820d164543c5bbe

am 8ac50107: merge from open-source master

Merge commit '8ac50107a21b96f6e9c77ab23820d164543c5bbe' into kraken

* commit '8ac50107a21b96f6e9c77ab23820d164543c5bbe':
  Allow 'adb pull' to pull symlinked files

adb/file_sync_client.c

diff --git a/adb/file_sync_client.c b/adb/file_sync_client.c
index 0ebfe73..65d4941 100644
--- a/adb/file_sync_client.c
+++ b/adb/file_sync_client.c
@@ -959,7 +959,7 @@
         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,