Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34bff9ae authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 8ac50107: merge from open-source master 

Merge commit '8ac50107' into kraken

* commit '8ac50107':
  Allow 'adb pull' to pull symlinked files
parents 7ae4e690 8ac50107

adb/file_sync_client.c

+1 −1
Original line number Diff line number Diff line
@@ -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,