openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes I25bdcbc5,I12314da5,I055b0821 am: a3892504ac am: 81d3447fa9 

am: fd3770a5a2

* commit 'fd3770a5a26b23303d49686cd24bab2939e5776b':
  adb: don't pull symlinks when pulling a directory
  adb: remove extraneous newline from skip message
  adb: correctly count skipped files in push/pull
This commit is contained in:
Josh Gao 2015-12-01 02:52:46 +00:00 committed by android-build-merger
parent d8ef1873f4 fd3770a5a2
commit 68e26811f0
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
adb/file_sync_client.cpp
View File

@ -552,11 +552,12 @@ static bool local_build_list(SyncConnection& sc, std::vector<copyinfo>* filelist
} else {
if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode)) {
sc.Error("skipping special file '%s'", lpath.c_str());
ci.skip = true;
} else {
ci.time = st.st_mtime;
ci.size = st.st_size;
filelist->push_back(ci);
}
filelist->push_back(ci);
}
}
@ -723,8 +724,7 @@ static bool remote_build_list(SyncConnection& sc,
bool empty_dir = true;
// Put the files/dirs in rpath on the lists.
auto callback = [&](unsigned mode, unsigned size, unsigned time,
const char* name) {
auto callback = [&](unsigned mode, unsigned size, unsigned time, const char* name) {
if (IsDotOrDotDot(name)) {
return;
}
@ -735,12 +735,18 @@ static bool remote_build_list(SyncConnection& sc,
copyinfo ci = mkcopyinfo(lpath, rpath, name, mode);
if (S_ISDIR(mode)) {
dirlist.push_back(ci);
} else if (S_ISREG(mode) || S_ISLNK(mode)) {
ci.time = time;
ci.size = size;
filelist->push_back(ci);
} else {
sc.Warning("skipping special file '%s'\n", name);
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;
}
filelist->push_back(ci);
}
};