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

Commit 7b284b2f authored by Josh Gao's avatar Josh Gao
Browse files

adb: don't pull symlinks when pulling a directory 

The previous change to do this (f96dc73b) only skipped individually
named symlinks, not symlinks inside of a directory that was being
pulled.

Bug: http://b/25601283
Change-Id: I25bdcbc546a9d3a0dbd8dacdb065fb134d96022b
parent d3266e05

adb/file_sync_client.cpp

+4 −1
Original line number Diff line number Diff line
@@ -736,9 +736,12 @@ static bool remote_build_list(SyncConnection& sc, 
        if (S_ISDIR(mode)) {

            dirlist.push_back(ci);

        } else {

            if (S_ISREG(mode) || S_ISLNK(mode)) {

            if (S_ISREG(mode)) {

                ci.time = time;

                ci.size = size;

            } else if (S_ISLNK(mode)) {

                sc.Warning("skipping symlink '%s'", name);

                ci.skip = true;

            } else {

                sc.Warning("skipping special file '%s'", name);

                ci.skip = true;