diff options
| author | Josh Gao <jmgao@google.com> | 2015-11-10 02:22:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-10 02:22:47 +0000 |
| commit | 0bb1ce06ea46f14d5b6bc57db8c8d6c463b5b1de (patch) | |
| tree | 39959927639801f0561ed2167562c6e421a61616 | |
| parent | 5a08fd35c9ed77a354dfb4b71ba754dc148716ca (diff) | |
| parent | 8d00a39eff5f4047a4a4ad007900df2bdd1c1e9a (diff) | |
| download | core-0bb1ce06ea46f14d5b6bc57db8c8d6c463b5b1de.tar.gz core-0bb1ce06ea46f14d5b6bc57db8c8d6c463b5b1de.tar.bz2 core-0bb1ce06ea46f14d5b6bc57db8c8d6c463b5b1de.zip | |
Merge "adb: don't try to pull character or block devices."
| -rw-r--r-- | adb/file_sync_client.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/adb/file_sync_client.cpp b/adb/file_sync_client.cpp index d71ca8de1..332276368 100644 --- a/adb/file_sync_client.cpp +++ b/adb/file_sync_client.cpp @@ -862,7 +862,8 @@ bool do_sync_pull(const std::vector<const char*>& srcs, const char* dst, continue; } - if (S_ISREG(mode) || S_ISLNK(mode) || S_ISCHR(mode) || S_ISBLK(mode)) { + if (S_ISREG(mode) || S_ISLNK(mode)) { + // TODO(b/25601283): symlinks shouldn't be handled as files. std::string path_holder; struct stat st; if (stat(dst_path, &st) == 0) { |