merge from open-source master

Change-Id: I7f30144c12c340501f161fba70a917eb62afc41f
This commit is contained in:
The Android Open Source Project 2010-04-16 12:36:35 -07:00
commit 8ac50107a2

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,